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

Browse Source

* commit 'af46e1b404c1d4fea17a24e5a49f23a7d0c982f7':
  docs: Updating the permissions docs for Preview 3.

...

This commit is contained in:

Andrew Solovay

2015-08-17 17:35:05 +00:00

committed by Android Git Automerger

parent c57f309a1b af46e1b404

commit a8f68d2da7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available