OSDN Git Service

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev...
authorJeff Sharkey <jsharkey@google.com>
Fri, 2 Dec 2016 20:35:56 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:35:56 +0000 (20:35 +0000)
commit375f16eff43c11e25355f7b697f41826668a68bf
treee654b2212fe30e2c12d970b249744a4ba7f467a1
parent00cc40c40a742c4aad41d0163a61b147065b15e8
parent341813c8523185ba09cf0c526ae07ae51ff0d6e0
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1  -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4  -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d
am: 341813c852

Change-Id: Ia32a4880fc1c050122050099660d23322a51bbcc