tree 17361014862ef4c3493ce3e3c93ea474ddf1553f
parent efaf2c857aac326df2051ac2c419be26bd3d5a6f
parent ddaac40dc8f034c6d1f44fb95f3d710c44a97b39
author Baligh Uddin <baligh@google.com> 1395333461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395333461 +0000

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658

* commit 'ddaac40dc8f034c6d1f44fb95f3d710c44a97b39':