| commit | c6cd58267bd8b0d7b1fd42787a31562307de8ab2 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 27 10:49:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:49:42 2015 +0000 |
| tree | 31930a291c99fe616059e735ef57023eff11a9c7 | |
| parent | 2f041b66ae4833317b7f2d9782c3d3a3fb4938bf [diff] | |
| parent | 8599758a591707ff046e5f34a9e6a490fab93c36 [diff] |
am 8599758a: (-s ours) am f999f8b8: am ddcac09d: Merge "Avoid cpu mismatch to ARM during cross compiling" * commit '8599758a591707ff046e5f34a9e6a490fab93c36':