OSDN Git Service

Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev
authorEvan Charlton <evanc@google.com>
Tue, 3 Jun 2014 03:47:06 +0000 (03:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Jun 2014 03:47:06 +0000 (03:47 +0000)
commitfaa3ff9ba89486aad83eab0526aea46ea7bbcfe6
treeb8c13aad0ba1ddc4b9f786c6b95d22e9c9eddb4a
parent6510d43d073747387a59636a18f13da98ff4183f
parentfda1855eaa61daad528cb444e99d0fc5195a7bd1
Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev
api/current.txt
core/res/AndroidManifest.xml
core/res/res/values/strings.xml
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl