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 00:57:56 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Feb 2017 00:57:56 +0000 (00:57 +0000)
commitc510e19d18cf00886c9810dab5509527282f9d3d
tree3aba9789b5b71ec03569140c41312fd9e168641f
parent9fbd981f2309c3ad6e3897b1dada03b10a1bd034
parent7556690cf50ef3fdad266571e088a45618f90c1b
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
am: 7556690cf5

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