tree effeac55094aa7885249c7f9e9db0dfb65a0da22
parent c089b0d2b1bf1bd511cd54dc51d9186b6ce41681
parent 72823acc22466d120053cc2e06057214f561aee4
author The Android Automerger <android-build@google.com> 1380546034 -0700
committer The Android Automerger <android-build@google.com> 1380546034 -0700

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