OSDN Git Service

DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 20:17:33 +0000 (20:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:17:33 +0000 (20:17 +0000)
am: a55258bd17

Change-Id: Idc5bde3158245925645d1ab69115df561922a758


Trivial merge