commit | 1533f95bbaf2a8895b05d146e578e47d8a69dadd | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed Aug 26 01:14:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 01:14:30 2015 +0000 |
tree | 6fb5d2941e25452d8e35d4d635795ad05963f91a | |
parent | 4f2015a155175f9da36574a378ce15ed74027ae9 [diff] | |
parent | 615af25ffdde99331c173499446e08c3a7ec32a8 [diff] |
am 615af25f: am a421c1e5: Merge "Possible Mac build fix." * commit '615af25ffdde99331c173499446e08c3a7ec32a8': Possible Mac build fix.