tree f48b3ead4351a28c329dcb8d769547866446ca11
parent ae97c0864591a7da9ec0afc3a2363c2ece71c5f1
parent 669f56033835fd73022e6dc8be052619e8c08e23
author yinxu <yinxu@google.com> 1502284512 +0000
committer android-build-merger <android-build-merger@google.com> 1502284512 +0000

Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
am: 669f560338

Change-Id: Ia5f2a3273a09fe457ef913fb8c0d37791b52bf68