tree 15c1d42c7655c1a6a7c32b4d69a55710f76ce5a6
parent 3124836952dc1f2dbcc4d665d4d1ecf29644eaa1
parent 31d52e29ddfd868db629105ec63d20d904ea79da
author The Android Automerger <android-build@google.com> 1395792415 -0700
committer The Android Automerger <android-build@google.com> 1395792415 -0700

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