commit | b916301d8029fe67155401b505b01d893db3931e | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Tue Feb 14 01:13:53 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Feb 14 01:13:53 2017 +0000 |
tree | 0075f444816505ba2f23e97220c119c0ea78ecaa | |
parent | 985fefd01201fceaf0655e2173b6e4ad0513fdd6 [diff] | |
parent | b8aac6758bae0f2f61e60006f9e53b3a5a4283bd [diff] |
Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: ee37330dff" into nyc-mr2-dev-plus-aosp am: b8aac6758b -s ours Change-Id: I0c9b341f62533e895c104c2f14ed911476b58eef