| author | Jean-Baptiste Queru <jbq@google.com> | |
| Thu, 21 Oct 2010 16:54:30 +0000 (09:54 -0700) | ||
| committer | Android Git Automerger <android-git-automerger@android.com> | |
| Thu, 21 Oct 2010 16:54:30 +0000 (09:54 -0700) | ||
| commit | 482358fda727ceab18412d63098db524a46999e8 | |
| tree | 9804bc4113ae1fa35c77802a3d130888a9156410 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 28ebb94c98609943a858f5d01d0760ca9f132149 | commit | diff |
| parent | d29b8a51a5f95a3f38e5fb812231e12e5a66a865 | commit | diff |
am d29b8a51: am 5109146f: Merge "Reconcile assembly-only macros in <machine/cpu-features.h>"
Merge commit 'd29b8a51a5f95a3f38e5fb812231e12e5a66a865'
* commit 'd29b8a51a5f95a3f38e5fb812231e12e5a66a865':
Reconcile assembly-only macros in <machine/cpu-features.h>
Merge commit 'd29b8a51a5f95a3f38e5fb812231e12e5a66a865'
* commit 'd29b8a51a5f95a3f38e5fb812231e12e5a66a865':
Reconcile assembly-only macros in <machine/cpu-features.h>