am 2aea83a4: (-s ours) keep history after reset to jb-ub-latinimegoogle-bayo

* commit '2aea83a4f99646cb24221cf16c2a9f7bc059a30e':
tree: 47a89f012ad5e2ba2bbb300f809b2354914163f9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk