tree d79c9b551d9834127c52e4388e0de2f05915e37e
parent 8dfd538193e289d85c19d42dcecc181abe589a90
parent acf91e463acf613ddef2e6e6bb68f5d92665f305
author Alex Cheung <alexcheung@google.com> 1431722114 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431722114 +0000

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

* commit 'acf91e463acf613ddef2e6e6bb68f5d92665f305':