| commit | 9e55c327f79f02fcbc3f39ef9942146c620b4220 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 27 10:46:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:46:33 2015 +0000 |
| tree | ee3b26be086daa9c9cb3124d7da6216c8997109b | |
| parent | 6d730c6d04a35841331e1bfb8a487fa68e0faedb [diff] | |
| parent | 7816e32f0fc6f3643a5d0ff5cb3ab8d24165d070 [diff] |
am 7816e32f: (-s ours) am a6a27329: Fix build breakage on mips64 and x86_64. * commit '7816e32f0fc6f3643a5d0ff5cb3ab8d24165d070':