OSDN Git Service

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

Change-Id: I36a6cf33803635becf8ff794bb8f4e02ba5cd1d4


Trivial merge