tree e2f855e87d46f355b6b9efded9fbb2997be23161
parent 40cf04c360d5bfb43c5e66255a515ab72a604d37
parent a04989e8b2e2b96159e0039291dcf16d33f8ca03
author Elliott Hughes <enh@google.com> 1437081810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437081810 +0000

am 683790ae: Merge "init: Fix bootchart trigger for emulator"

* commit '683790ae54cd0202385027d259f78894639911e7':
  init: Fix bootchart trigger for emulator