tree d8165f5b8d337e73942ee29d66fb40585dc7caf1
parent c4621985bdfc2b27494087e5dee65a6d0cc5a632
parent 1ae3e92ea7d67d9928ea8cedd9a7c5d364610f64
author The Android Automerger <android-build@google.com> 1379477447 -0700
committer The Android Automerger <android-build@google.com> 1379477447 -0700

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