tree 9d244524a113db326aa9e86caab40c49a08248f3
parent 0370be96e33ea0c8fb4069e704deccce43b7403c
parent 9570a77ad36fa8bc3b58eb831199b0047788658e
author The Android Automerger <android-build@google.com> 1395792417 -0700
committer The Android Automerger <android-build@google.com> 1395792417 -0700

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