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

This commit is contained in:
The Android Automerger 2013-10-06 06:02:14 -07:00
commit 5e5bcc1799

Diff content is not available