tree 826bc6c6ec44180c5bbb1fc8fd7634b544fdc597
parent afe83a6720023ecf4b4c6b712c5519dd6a382b8f
parent 4841d264054fb1c61320986b56cc10e379237674
author Chenjie Yu <cjyu@google.com> 1550103273 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1550103273 +0000

Merge "fix multiple activation across boot"