am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"

* commit '7e71d42701e6ad78d4327db40ef7d34e1e75c1e2':
This commit is contained in:
Elliott Hughes 2015-08-27 11:39:49 +00:00 committed by Android Git Automerger
commit e455dff013

Diff content is not available