diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 13:18:41 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 13:18:41 -0700 |
commit | 30ee84f92cb832c789366c516fcadb718ccc25e8 (patch) | |
tree | 22506c2ce7954f12ec0fd7a5571b5883892ef2ee /9/platforms/android-18/arch-x86/usr/include/asm/i387.h | |
parent | 4681e74532985ab2d69c920267428b82305f8196 (diff) | |
parent | f644f7d6348edf1327d3a792c66e9446ed143511 (diff) | |
download | prebuilts_ndk-30ee84f92cb832c789366c516fcadb718ccc25e8.zip prebuilts_ndk-30ee84f92cb832c789366c516fcadb718ccc25e8.tar.gz prebuilts_ndk-30ee84f92cb832c789366c516fcadb718ccc25e8.tar.bz2 |
am f644f7d6: am b1ceaa32: am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f644f7d6348edf1327d3a792c66e9446ed143511':
Diffstat (limited to '9/platforms/android-18/arch-x86/usr/include/asm/i387.h')
0 files changed, 0 insertions, 0 deletions