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

This commit is contained in:
The Android Automerger 2013-10-15 21:14:09 -07:00
commit 993da5c301

Diff Content Not Available