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

* commit '2aea83a4f99646cb24221cf16c2a9f7bc059a30e':