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:28:18 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:28:18 +0000 (19:28 +0000)
commitacfda3d71a68fced312e8c124a0fe4d7cb440426
treeee98e6338dce5ffee11f77960a31cb019f414035
parent7e54dc58d453d545f783eef24c8f972f39e79130
parenta51ebb828ab2ba3327a2cb001cea55b60462fc65
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

Change-Id: Ic67fac2e28ab776632a98e3556c46826d7335a91