| commit | 2364bc2ca2c7b3abf9ee54cb66d103b14eb3aac9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:56:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:56:06 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 625c8cf68432a912500574c7b92fe3244d8a204d [diff] | |
| parent | b87691e944117fcf4205456bfcb7972073279a57 [diff] |
am 1533f95b: (-s ours) am 615af25f: am a421c1e5: Merge "Possible Mac build fix." * commit '1533f95bbaf2a8895b05d146e578e47d8a69dadd':