tree b3ba769c23f37fb07254ecd02c91d8a0684823b8
parent 23c063935d615296d0b6442c9678e0133087f08e
parent 43f4997df80e86e1feaeac674c938c06b787b2c7
author Ying Wang <wangying@android.com> 1332183415 -0700
committer android code review <noreply-gerritcodereview@google.com> 1332183415 -0700

Merge changes I11cf3610,I09d6cba7

* changes:
  New lib64SDL.a and lib64SDLmain.a for 64-bit emulator
  Update linux-x86/SDL with X threading bugfix