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

This commit is contained in:
The Android Automerger 2013-08-12 06:00:44 -07:00
commit f63a467cdd

Diff Content Not Available