| commit | 39392f04819e168a4e63ff15768dacb609e99ef8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 05:02:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:02:21 2015 +0000 |
| tree | 5bc92de6f453a0652b1965bdc90e8a78a42a1fcc | |
| parent | 8d395444b2e07aa9baf97166ebcacd1b925a6329 [diff] | |
| parent | dc289ce17c1f009e3054d0c176b2aefc78887b9e [diff] |
am dc289ce1: (-s ours) am 344c3394: am 6f534125: Merge "Fix Linux host checkbuilds." * commit 'dc289ce17c1f009e3054d0c176b2aefc78887b9e':