tree 9b9d16dfaded74da356597889544b8575cea3307
parent e35f8e2cacdb44284014b8c7bc688fac9859f632
parent aebea1b0627df202e5c05d818b368909ebe0dbf0
author Baligh Uddin <baligh@google.com> 1395277978 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277978 +0000

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

* commit 'aebea1b0627df202e5c05d818b368909ebe0dbf0':