OSDN Git Service

Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc...
authorJeff Sharkey <jsharkey@google.com>
Fri, 2 Dec 2016 20:22:18 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:22:18 +0000 (20:22 +0000)
commita6e6391eac4efa8957c0c326d01503b9320ca2c8
tree24e56f5da884daf8808448206aee620ec19bdc75
parentb6ced762ed2a5ef1b688b8fde5791e759ef8e66c
parentb249844ee2f9a8991df155be0a01f8a689367250
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746  -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: b46e9bb9cb" into nyc-mr2-dev-plus-aosp
am: b249844ee2  -s ours

Change-Id: I78f423d26cd023085f87ac3be5a7c8588985ad22