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

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

Diff Content Not Available