am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit '4988378cd0f1bb6cdd83f797d10fd45105672296':
  Introduced android.permission.PEERS_MAC_ADDRESS permission
tree: 36e59a48ce3dffa16c0541209104ce6e1b2449fe
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py