am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'ae6a44857a0b3d9e37c53f2cfd42e13003c68408':
  add columns of Carrier about MVNO
tree: 4f01a1cb5a2b1c9290f97e609258a999f6ef4c47
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk