OSDN Git Service

DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 18:39:20 +0000 (18:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 18:39:20 +0000 (18:39 +0000)
commit928c09cd8e2942c49345498bf5054a2cf97b40fc
tree59633c0c732a1b8a0150d16409b92aa670bdffa7
parentf1085f2dc833c1f6fed3e4d6742b3300bbc4dc63
parenta1d1ecbe05d89b06d7fe9873c5ed86613a226b33
DO NOT MERGE. Check provider access for content changes. am: 9b85862620  -s ours am: 9277cce7fa
am: a1d1ecbe05  -s ours

Change-Id: I6d4f8a29537e19545bf94a886aecea8ba05a6de7