OSDN Git Service

Merge "move ACTION_SERVICE_STATE to system api" into oc-dev
authorChen Xu <fionaxu@google.com>
Tue, 4 Apr 2017 23:49:02 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 23:49:02 +0000 (23:49 +0000)
am: 5effb5f645

Change-Id: I5b61b20b646a9bfae4e0f89c70f7af71f626c740

1  2 
api/system-current.txt
telephony/java/com/android/internal/telephony/TelephonyIntents.java

Simple merge