OSDN Git Service

Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
authoryinxu <yinxu@google.com>
Wed, 9 Aug 2017 13:15:12 +0000 (13:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 13:15:12 +0000 (13:15 +0000)
commit6b48db9770d5a8313228e963fb021fd91b7efa2b
treef48b3ead4351a28c329dcb8d769547866446ca11
parentae97c0864591a7da9ec0afc3a2363c2ece71c5f1
parent669f56033835fd73022e6dc8be052619e8c08e23
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
am: 669f560338

Change-Id: Ia5f2a3273a09fe457ef913fb8c0d37791b52bf68
core/res/AndroidManifest.xml