am 0aac5065: Merge "Make the epoch-related "can\'t happen" situation easier to spot." into ics-mr1-plus-art

* commit '0aac50652ef961ba3aafa44d43871190d23be1ce':
  Make the epoch-related "can't happen" situation easier to spot.
tree: c50966c75984054523b66f58122b5de5f6d866fd
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk