tree b48d7c915c2dc53585e616cde49124fb2d3e38e9
parent 984bb68a6561d54ac70868758fd5e62b5dd2bea0
parent 046fdb7d99f626c83b1664eae77d3a796f53eadc
author Chen Xu <fionaxu@google.com> 1487036535 +0000
committer android-build-merger <android-build-merger@google.com> 1487036535 +0000

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

Change-Id: If9d62816f9e9809acfb7d4873399acf6540ecf6f