tree 69840e81e1666cc9304e48475e1080b8ca2cbf28
parent 637f5f16eea84ee5399c2bbe69aae862cb4c30c8
parent b9278c793399822c36192b236ec29a769202ab02
author Geoff Mendal <mendal@google.com> 1386379827 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386379827 +0000

am b9278c79: Keep history after reset to klp-dev

* commit 'b9278c793399822c36192b236ec29a769202ab02':