am adb156e0: am 336f18ba: am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit 'adb156e05aa2bf214f58e0a7924cc341fe4c327c':
  Add checks for READ_PRIVILEGED_PHONE_STATE.
tree: be5f7e7d72a7982bf4499da1eb388d7747a630d8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py