Merge "resolved conflicts for merge of 05292dd6 to jb-mr1-dev" into jb-mr1.1-dev
tree: c63300f993ca13a4bd39c8224c76fb10ff27e240
  1. libc/
  2. libdl/
  3. libm/
  4. libstdc++/
  5. libthread_db/
  6. linker/
  7. tests/
  8. .gitignore
  9. Android.mk
  10. CleanSpec.mk