commit | 678ef830178b933bbc5f41481d08ebba70f3e936 | [log] [tgz] |
---|---|---|
author | Aart Bik <ajcbik@google.com> | Fri Jan 22 00:53:05 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 22 00:53:05 2016 +0000 |
tree | b795c976f33156631bef70fe6362b6eefc529ce2 | |
parent | f8146ddf812c5526886dac9167972f6c1c2ad882 [diff] | |
parent | 475a05e03a7fff101f0b2e97e20a7079e00cc3ec [diff] |
Merge "Fix cpu-info/cpp-defines mismatch." am: 475a05e03a * commit '475a05e03a7fff101f0b2e97e20a7079e00cc3ec': Fix cpu-info/cpp-defines mismatch.