tree 27939745a42f62bdc752d261df8faae35176c325
parent e1205d88a21395ada663cf79f611d8037722e97b
parent 53621e612f62941edf3502b152130749459c1ae0
author The Android Automerger <android-build@google.com> 1381669356 -0700
committer The Android Automerger <android-build@google.com> 1381669356 -0700

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