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

Change-Id: I231c3a499177db213b0406ea84e7ea3c224f132d


Trivial merge