tree 10da860fcff71886af91d082e31f0e1917926848
parent 33840825c8aa2ff6a9d3fde4f9476800d689ca4e
parent 24082c8a0de34df6fcd1c17781a6d9bbc522f083
author Baligh Uddin <baligh@google.com> 1414566500 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566500 +0000

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

* commit '24082c8a0de34df6fcd1c17781a6d9bbc522f083':