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:35:08 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:35:08 +0000 (20:35 +0000)
am: 2f48a6ce63

Change-Id: I4d17af1f12a727bd5b00167ccb19a045791f18a6


Trivial merge