commit | 8a1cff06c299a2c5967b0483acd3a1d35a690cbe | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Fri Dec 02 20:23:54 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 02 20:23:54 2016 +0000 |
tree | 24e56f5da884daf8808448206aee620ec19bdc75 | |
parent | a6e6391eac4efa8957c0c326d01503b9320ca2c8 [diff] | |
parent | 84938307a9dac956532df4e4f406bd06012a8e36 [diff] |
Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp am: fb9a16a3f3 am: 84938307a9 -s ours Change-Id: I27d9fc94ea345cf8481295efab717ceb552b3177