OSDN Git Service

Merge "don't blindly reuse content providers" into oc-dev
authorTodd Kennedy <toddke@google.com>
Wed, 19 Apr 2017 23:21:06 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 23:21:06 +0000 (23:21 +0000)
commit21967abbf7c9d1d48554d1306408941d9cc97bea
treea5eabbfe67e050ace3935db35e6ee53957b39e81
parent31d5f7ee7c7861bee147172fb12afe4a4026b353
parent9b32a057c76e460cfa157e6e7346c62a83a502f1
Merge "don't blindly reuse content providers" into oc-dev
am: 9b32a057c7

Change-Id: I3d4fc2c9d877a0065e67ca9ec7d5f3cfedec9046
services/core/java/com/android/server/am/ActivityManagerService.java