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

am 95e5bc58: keep history after reset to ub-camera-haleakala

* commit '95e5bc585d1247b8f5a4124c4f6571b38a25cd3d':