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