tree cbc5703683c2778051297e24888bb8507d640dc6
parent ccaf066d6d441b108bab711ae36d8bddce66edee
parent 4988378cd0f1bb6cdd83f797d10fd45105672296
author Fyodor Kupolov <fkupolov@google.com> 1438289909 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438289909 +0000

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

* commit '4988378cd0f1bb6cdd83f797d10fd45105672296':
  Introduced android.permission.PEERS_MAC_ADDRESS permission