merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-15 06:00:50 -07:00
commit 2d7d92e811

Diff Content Not Available