| commit | 135146652f349899afca6f7447643bb2039a5936 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:39:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:39:49 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 994f69b4c347982ccac648118e0276a61936b59e [diff] | |
| parent | 19cd34afddaf39b92c4ed1b68f7aab00ab77873d [diff] |
am 7e71d427: (-s ours) am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator" * commit '7e71d42701e6ad78d4327db40ef7d34e1e75c1e2':