tree b010fd0eb1520d19debd1e90a9a8d71bd0a833a8
parent 333ceb4f66ccf790081026f645474e07d832fbdb
parent a0470879e25394cb85437366fa53ce8055cd556f
author The Android Automerger <android-build@google.com> 1395666052 -0700
committer The Android Automerger <android-build@google.com> 1395666052 -0700

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