tree 637c5af9d7295b234ae96768dcf4737cba926db7
parent 740162d7f72937bd6433c574aeb0b5ad4ae6a778
parent 5e93bb6e9e746d7c64f8309e2d207368266c030b
author Chen Xu <fionaxu@google.com> 1485810676 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1485810676 +0000

Merge "revert deprecated sim activation logic"