OSDN Git Service

Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0 am: 3424136a59
authorHall Liu <hallliu@google.com>
Fri, 22 Dec 2017 01:01:50 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Dec 2017 01:01:50 +0000 (01:01 +0000)
am: effcd1f508

Change-Id: Ibefdba1da5da4bfdf93d7db4c0f42a79ad75be46

1  2 
api/current.txt
core/java/android/content/pm/PackageManager.java

diff --cc api/current.txt
Simple merge