tree 9be282141f29b6c5ec7d6b75bffb59a05d26be42
parent c1c05de415854eb7a13a16b7e22a22de8515123a
parent 3134a0bb18992094f6dd935e3aed1f24ea87520d
author The Android Automerger <android-build@google.com> 1379595710 -0700
committer The Android Automerger <android-build@google.com> 1379595710 -0700

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