OSDN Git Service

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 18:45:30 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 18:45:30 +0000 (18:45 +0000)
am: b88d8dc58f

Change-Id: I9587d5abd8d0525e3b098a5f9662e5edbc1f9c12


Trivial merge