commit | c46a3b0dc502a3cab8e9e56f245e2d4e06cf6002 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Fri Dec 02 19:14:18 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 02 19:14:18 2016 +0000 |
tree | c4d1d6c35effb6c5d4474d0f2066640d1b046fc5 | |
parent | 8384bb231e679d5ec038d3ccd5fc04aeec99b71f [diff] | |
parent | d949aa9afe479c8a2c78bd99d5d4603cb91a5f6b [diff] |
Merge "DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a" into nyc-mr2-dev-plus-aosp am: d949aa9afe -s ours Change-Id: I5c271fd23c03564165faf10d0d7499ef62325d34