Merge "Work around two problems." into dalvik-dev
tree: d41c461f11a6e75ee1893a159272ffb70e252e7f
  1. build/
  2. src/
  3. test/
  4. tools/
  5. Android.mk