am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

* commit 'f377bffb30c78aaa5dd4188400a018a9febc2afd':
  docs: Updating the permissions docs for Preview 3.
This commit is contained in:
Andrew Solovay
2015-08-17 17:54:30 +00:00
committed by Android Git Automerger

Diff Content Not Available