OSDN Git Service

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am...
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 00:51:18 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:51:18 +0000 (00:51 +0000)
am: 2e3a277175

Change-Id: I24b189c0e0c006a06c4c08e64a1de911fa7cc32c


Trivial merge