OSDN Git Service

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

Change-Id: I50ab47cb03b65cc8be78c9a139561e4befbb1a95


Trivial merge