tree 8deb001012eca30927c1ec5cc54d963e5b72f26c
parent 1c39fdcd9eb628338d7f273e43723585ca35721a
parent f981b1ed0f5f5428aa686a2de306002463ce16e2
author The Android Automerger <android-build@google.com> 1381323731 -0700
committer The Android Automerger <android-build@google.com> 1381323731 -0700

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