tree 9b9d16dfaded74da356597889544b8575cea3307
parent 149268d8698f316a70cce2515e7787334e62d23d
parent ddaac40dc8f034c6d1f44fb95f3d710c44a97b39
author Baligh Uddin <baligh@google.com> 1395283621 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395283621 +0000

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

* commit 'ddaac40dc8f034c6d1f44fb95f3d710c44a97b39':