tree e5d2177e6b743f33aae5f1b2151f099605d0bd25
parent ff703a3fd0af46b1f4a97189961ce35dae137ebc
parent 9e7bd59457c973a297f7d32847cb7d064fced1e8
author Jeff Sharkey <jsharkey@android.com> 1480704837 +0000
committer android-build-merger <android-build-merger@google.com> 1480704837 +0000

DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d
am: 9e7bd59457

Change-Id: Ia76c61296501cede3473ac743583643135820ad4