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

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