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)
commita55258bd171c2649fc63be181c110796447c84a6
tree0fc888e60d084ac7edcf21c99866fcfe7fbb83ea
parentf00515f4d935190b716c4a1bc18a489ddd5d8de8
parent383e0cfa062d735b949bbb0fc7e98f97d702482a
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5  -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc  -s ours am: 836b54e6bb
am: 383e0cfa06

Change-Id: I231c3a499177db213b0406ea84e7ea3c224f132d