am f94404ea: Merge "Ignore the redundant InferredRegCategoryMap." into ics-mr1-plus-art

* commit 'f94404ead1f2e4a1b5a2ff8bbdb65c5e4d4a77ea':
  Ignore the redundant InferredRegCategoryMap.
tree: afd81412b93e3e816f703cce65fc8bf089c42496
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk