tree d79c9b551d9834127c52e4388e0de2f05915e37e
parent d9f89c5ddf9da933b230e86fa3fa29477dc47b4b
parent ac008b7995cd6956fc466f873ee2d810779a1e9b
author Alex Cheung <alexcheung@google.com> 1431709501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431709501 +0000

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

* commit 'ac008b7995cd6956fc466f873ee2d810779a1e9b':