OSDN Git Service

DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 19:26:31 +0000 (19:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:26:31 +0000 (19:26 +0000)
am: 270d1c27ac

Change-Id: I426e531fd2fda1e09276dcfdc774fb548eedbefd


Trivial merge