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 20:19:28 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:19:28 +0000 (20:19 +0000)
commita43ee01a6d80f9e985e3171c4a6cf741c1ed8cb1
treee75c755a73a25fb4066ce9a32e96f7dc42fcf522
parent341813c8523185ba09cf0c526ae07ae51ff0d6e0
parent6786309c03480b3725b8206e8a238352f5c500dd
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 am: 0eaa192436 am: 43b3a13803
am: 6786309c03

Change-Id: Ie17a80be06549016951ff91792586e1dc2e004cc