tree 59d7200081149242a059083e1c8655b7ca637b0d
parent 8068899c30a9e0175fcea6cb68533cc50ea0719e
parent f0174de4dc0c810a350e19676f6cd5f233263a29
author Elliott Hughes <enh@google.com> 1437082787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437082787 +0000

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

* commit '770b78bd2384493f5b9b5c7a04b2fc10bdeed003':
  init: Fix bootchart trigger for emulator