OSDN Git Service

am 05dee112: am b8b242de: am 841e7eb9: Merge "Update intents for CarrierService"...
authorZach Johnson <zachoverflow@google.com>
Thu, 28 May 2015 00:37:53 +0000 (00:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 00:37:53 +0000 (00:37 +0000)
* commit '05dee112a13b715e29fdff16d57a75256d1ee044':
  Update intents for CarrierService

1  2 
api/current.txt
api/system-current.txt

diff --cc api/current.txt
Simple merge
Simple merge