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

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