tree 4aed3f0744967e55dedd158bbe8d4ebd18676971
parent 8b308ed70ed782f68c8075aac2a6b66bbfcdb9af
parent 152cd76544876c6ad9493470af0e67b8ee0961e0
author The Android Automerger <android-build@google.com> 1377003698 -0700
committer The Android Automerger <android-build@google.com> 1377003698 -0700

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