Merge "Fix compiling breakage (SIGSEGV) from doing "make -jN", where N > 1." into ics-mr1-plus-art
tree: a480b9cac50b86f9c58ce03e073349c0d38b270b
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk