tree 48b80c0137c7bd3f92e2ea2a2ed13a56f7680c56
parent 220f09fb4f6509bec1c344dda542fe3fd04cd997
parent 9be023f0772359137f7b4d933add43de2db1aaa0
author Andrew Solovay <asolovay@google.com> 1463078614 +0000
committer android-build-merger <android-build-merger@google.com> 1463078614 +0000

Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs
am: 9be023f077

* commit '9be023f0772359137f7b4d933add43de2db1aaa0':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I3af5d87f77b5b40c2c7dd7c099f3c62fe4649d28