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

This commit is contained in:
The Android Automerger 2013-10-09 06:00:32 -07:00
commit 86de770fa8

Diff content is not available