| commit | 9f1c99ceab001e682e7dd19039fada1da2c4bfba | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 03:47:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 03:47:44 2015 +0000 |
| tree | 7d5c193d683455afbc287a7cbe313a5e197c3fd7 | |
| parent | fc97c1b3e042a513fd51e42158539d0f49fe4e7e [diff] | |
| parent | 54b01b8017874a93a9fcc0a18f863b351e3ae596 [diff] |
am 615af25f: am a421c1e5: Merge "Possible Mac build fix." * commit '615af25ffdde99331c173499446e08c3a7ec32a8': Possible Mac build fix.