tree d932aefc1a7996c98d68e4ec6f59e5b40516c1be
parent aeeb9c8470761b4aade9a4392bf245a0545c2057
parent 4ad177829a249c317c8e5864310cb516c094a839
author Jeff Sharkey <jsharkey@android.com> 1480705362 +0000
committer android-build-merger <android-build-merger@google.com> 1480705362 +0000

DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0
am: 4ad177829a  -s ours

Change-Id: I946f7bab2f86d26c23460cc5664d901f4f8fff06