Merge "Make the epoch-related "can't happen" situation easier to spot." into ics-mr1-plus-art
tree: e23d66da163b4afbd29e09e80be6f51e828aa0c6
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk