tree e132b541045b1c69d350ffa39e663561da27a325
parent e559f97dadca4db717abf36bc0ecb1b3bebd23c0
parent 770ee2c594ee08c02f42a88563a971cfb4a8614f
author Chen Xu <fionaxu@google.com> 1485811368 +0000
committer android-build-merger <android-build-merger@google.com> 1485811368 +0000

Merge "revert deprecated sim activation logic" am: e895000feb am: 6d194feae1 am: 21c0992e50
am: 770ee2c594

Change-Id: Iaad7f217f73b03ac214d117107778cf0d359d340