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

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