Merge "Fix x86 build where compiler found lock issue" into dalvik-dev
tree: 4a1c38bb86bcdac56543e46ef5ebb5cf0e2379b9
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk