merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-17 06:00:37 -07:00
commit 48727a74ae

Diff Content Not Available