tree f0b4a38be60ff57a42ad673a3224023c4cbe4f19
parent 7ff216f80f6e53235b4239c6fb7da9b0d5127738
parent 51b475d4ed8b2945bb12dd37ca942a48c8897854
author The Android Automerger <android-build@google.com> 1379872278 -0700
committer The Android Automerger <android-build@google.com> 1379872278 -0700

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