am 15da61b7: am cd2923a6: keep history after reset to jb-ub-latinimegoogle-bayo

* commit '15da61b7b15e0de8902bc92a70740f6bac7d343a':