am 18c4535a: Merge "Fix crashes when a resolution method is passed to PrettyMethod." into ics-mr1-plus-art

* commit '18c4535aafb5a121c9a59a9dc5965f2cb4e5423f':
  Fix crashes when a resolution method is passed to PrettyMethod.
tree: b5cf3b3dec38eb3e8c24e0aa04ce4bfc2087ff4e
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk