tree fcbf225f64d7971ee7a09a34e805e611f26699e8
parent ec4fcdd90bf79b712b1d3e6560655fae039a786c
parent a8cdb45245a053f7576e22050a8a0d533aa35c16
author The Android Automerger <android-build@google.com> 1378990889 -0700
committer The Android Automerger <android-build@google.com> 1378990889 -0700

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