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

This commit is contained in:
The Android Automerger 2013-10-14 06:00:07 -07:00
commit 7e51751f0b

Diff content is not available