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

This commit is contained in:
The Android Automerger 2013-10-15 06:01:21 -07:00
commit 62cda376db

Diff Content Not Available