Merge "Fix annotations test 004." into dalvik-dev
tree: 1d018952a9da21dc747b39b5248598e4a1cc6ac2
  1. build/
  2. oat_process/
  3. oat_runtime/
  4. src/
  5. test/
  6. tools/
  7. Android.mk