tree 1e7fcf8dd5125ee70a270de4b000f0688166a546
parent 8cdce78cffda46ddf3d153735d6af584489e79b5
parent f7541d6dab62f9bd2d7fd96a7b6148d4c72d3b57
author Junda Liu <junda@google.com> 1500931753 +0000
committer android-build-merger <android-build-merger@google.com> 1500931753 +0000

Merge "Avoid updating carrier config if sim is still loading when unlock." into oc-dr1-dev
am: f7541d6dab

Change-Id: Ic6bbfb254c280a8caea436b8f2eb15a865ca6bb7