OSDN Git Service

DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 20:37:20 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:37:20 +0000 (20:37 +0000)
commitca76b0420a519d810382cff50c7952ee6dfce869
tree7affc4379417d1ee635616141e943abb4b818f67
parent65d1a92c924f1f588ac4295845ef89b6a877e63b
parenta43ee01a6d80f9e985e3171c4a6cf741c1ed8cb1
DO NOT MERGE. Check provider access for content changes. am: 9b85862620  -s ours am: 9277cce7fa am: a1d1ecbe05  -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a  -s ours am: 0eaa192436 am: 43b3a13803 am: 6786309c03
am: a43ee01a6d

Change-Id: I737ca593b673dae19b0b4a259ddf1583a687d5a5