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

This commit is contained in:
The Android Automerger 2013-10-03 06:01:22 -07:00
commit 91321f60ae

Diff content is not available