tree 60248c4e1078551948901c1b683450370a2f1356
parent 669d6694e1ea5e5892ef2db87dbede2ecd3b8903
parent 05d24ccdb5a0dc5dca9feb248f74ebb649e2d34f
author Android Build Merger (Role) <android-build-merger@google.com> 1487034621 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487034631 +0000

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