| commit | 17a397aa110c6601280b20146c199a56da3d9386 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Oct 03 12:05:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 03 12:05:42 2013 -0700 |
| tree | 9e01b2e134500a6749a1eea80d7e1fa9b463a6b3 | |
| parent | c31b59bd0d84379e252053be603240899923965e [diff] | |
| parent | 4face7bf943d93ee91ca94f05df2034550f318fd [diff] |
am 4face7bf: resolved conflicts for merge of 8d972a6f to klp-dev-plus-aosp * commit '4face7bf943d93ee91ca94f05df2034550f318fd': Remove references/use of ARCH_X86_HAVE_*.