OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am...
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 02:04:31 +0000 (02:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 02:04:31 +0000 (02:04 +0000)
commitcc6e5e818c9c9c3c7730f19bad6b47f0e1d467f9
treeaef533a7423ca0fa4e494d170e0b5556ae831606
parent5a5b2797d9b3283d59028163266eaaa5b24416fc
parentdec6e5ae4cb1bcd742211e3d89e5a2b774cd68c2
Merge "DO NOT MERGE. No direct Uri grants from system. am: 021747a076  -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 am: 8501b686f7 am: 030e74a380" into nyc-mr2-dev-plus-aosp
am: dec6e5ae4c  -s ours

Change-Id: I7a63b1fadf3453577fd469e57a771ba40a8c3aab