tree 14cbbc541be1db9e0e28d33ef7b621961f8df689
parent 36a7dc6fffca5be370e21498b46972f2e576837b
parent 6b784f4c921c3592972223879adc39ccb8a4047e
author Chen Xu <fionaxu@google.com> 1487036053 +0000
committer android-build-merger <android-build-merger@google.com> 1487036053 +0000

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

Change-Id: If0929c74d071f619a04dd4e5a33ff851769c140e