OSDN Git Service

Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into...
authorAmith Yamasani <yamasani@google.com>
Tue, 14 Feb 2017 01:07:53 +0000 (01:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Feb 2017 01:07:53 +0000 (01:07 +0000)
commit669d6694e1ea5e5892ef2db87dbede2ecd3b8903
tree60248c4e1078551948901c1b683450370a2f1356
parenta0dff34532f2b5bf3c95b5b7561964649aa4c7a2
parent67dbaa8a143548453a5048eb1e52591240de5749
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18
am: 67dbaa8a14

Change-Id: Ie554aec3a777468b8dc7da731337ffbdb2851846
services/core/java/com/android/server/am/ActivityManagerService.java