tree 5b6c5d980c7a1fff56b1faf17671ce2b570614de
parent 7fb77fa79a43fed5fc9558e69944b29681544cba
parent dee9d9e43c62a0145a185f7959ee487a3544a145
author The Android Automerger <android-build@google.com> 1376917274 -0700
committer The Android Automerger <android-build@google.com> 1376917274 -0700

merge in klp-release history after reset to klp-dev