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

This commit is contained in:
The Android Automerger 2013-09-09 06:00:49 -07:00
commit 4d36b74317

Diff content is not available