merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-01 07:07:20 -07:00
commit 5da8df2840

Diff Content Not Available