| commit | 3b1cddaa0dd3a745da0e3a01c761fed5c6844859 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:25:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:25:27 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | ecb2b648bf16b872cf23c2c8b0bedac4bad4281a [diff] | |
| parent | 135146652f349899afca6f7447643bb2039a5936 [diff] |
am e455dff0: am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator" * commit 'e455dff013360eb266ac6ecc0a63a5871722f27a':