merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-24 06:00:57 -07:00
commit 48161c898b

Diff Content Not Available