tree d79c9b551d9834127c52e4388e0de2f05915e37e
parent 95e5bc585d1247b8f5a4124c4f6571b38a25cd3d
parent ce1d390fbf0d4cad74dacdc55c0f6b1f98ae5cb1
author Alex Cheung <alexcheung@google.com> 1431720631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431720631 +0000

am ce1d390f: keep history after reset to ub-camera-haleakala

* commit 'ce1d390fbf0d4cad74dacdc55c0f6b1f98ae5cb1':