| commit | 386872e4a7efa6faeb3730100655993c21636b3f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 03:52:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 03:52:35 2015 +0000 |
| tree | 04d140baf861d90038600f46a4a184e0a61d8bac | |
| parent | 00d76fd2ae1bccd8d44976160714ea989641d15c [diff] | |
| parent | 9f1c99ceab001e682e7dd19039fada1da2c4bfba [diff] |
am 495c8a06: am 615af25f: am a421c1e5: Merge "Possible Mac build fix." * commit '495c8a060353798169860f53647a25fe0cff50a9': Possible Mac build fix.