merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-22 06:00:33 -07:00
commit 58ccd60877

Diff Content Not Available