tree baf5f9165ca5e78344cdf00049019bd8d6270a37
parent c130d7fd5ea010fac0abc7d04422adf72c393346
parent 928c09cd8e2942c49345498bf5054a2cf97b40fc
author Jeff Sharkey <jsharkey@android.com> 1480704961 +0000
committer android-build-merger <android-build-merger@google.com> 1480704961 +0000

DO NOT MERGE. Check provider access for content changes. am: 9b85862620  -s ours am: 9277cce7fa am: a1d1ecbe05  -s ours
am: 928c09cd8e

Change-Id: Ic470197dcc815e7ecf6b47dfd74ff6f4f74f1804