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

This commit is contained in:
The Android Automerger 2013-10-13 06:02:49 -07:00
commit 18725ed10a

Diff content is not available