merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-25 06:01:31 -07:00
commit 90b1c3d221

Diff Content Not Available