tree e7a54353e0f56525cb3f54d63e6094da3ed0e018
parent 7cdea7c9a281859bbeb572028d76ef18489ca72c
parent 6b7498999ac89406aabf25c065eafd4a89686c76
author Chen Xu <fionaxu@google.com> 1487037443 +0000
committer android-build-merger <android-build-merger@google.com> 1487037443 +0000

Merge "update sim activation state for otasp" am: 6b784f4c92 am: 046fdb7d99 am: 774dfb7212
am: 6b7498999a

Change-Id: I098a6796f025e02b6800e22df61b15f4766ff098