merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-11 06:00:49 -07:00
commit ecc5a5d415

Diff Content Not Available