tree cfd0f9f41fade3e4e78bbb90a9aef9223f6366bb
parent d0c4105754656373ad18fbbca702b3ecfc55dc5c
parent 4ffadacd161d09651632cfd69a072fa1bad651ec
author The Android Automerger <android-build@google.com> 1378848544 -0700
committer The Android Automerger <android-build@google.com> 1378848544 -0700

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