tree 7affc4379417d1ee635616141e943abb4b818f67
parent a2a069e99815fe5c1a28f7454b0924826c790e44
parent 0e673a814396a76558fab5c153292568d1884d70
author Android Build Merger (Role) <android-build-merger@google.com> 1480708160 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480708162 +0000

Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c" into nyc-mr1-dev-plus-aosp