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 19:45:33 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:45:33 +0000 (19:45 +0000)
commit0eaa1924366216c8b0737fe7b9f41875f438db14
treed932aefc1a7996c98d68e4ec6f59e5b40516c1be
parent3fa188bd8f7bccb32a4880ffc4ffcb647e02f781
parentacfda3d71a68fced312e8c124a0fe4d7cb440426
DO NOT MERGE. Check provider access for content changes. am: 9b85862620  -s ours am: 9277cce7fa am: a1d1ecbe05  -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a
am: acfda3d71a  -s ours

Change-Id: I0857c3cdd2e471ad04dbafc22a7898168a615a24