| commit | 8d4c20af1518b8a30fdb690f59dc0b2d0ca60a47 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 02:02:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 02:02:57 2017 +0000 |
| tree | aef533a7423ca0fa4e494d170e0b5556ae831606 | |
| parent | 9cbe93be660fffea557cbb9d35c6dd9fc25511d1 [diff] | |
| parent | a41406165829843b623175f15a5b1df5bb1e4796 [diff] |
Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c am: 34df10ec98 am: 0387fd89f2" into nyc-mr2-dev-plus-aosp am: a414061658 -s ours Change-Id: Ic4b7f31bd87b94e347416b40a1dcf01e45f34cc1