merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-02 07:07:20 -07:00
commit 9db12e44af

Diff Content Not Available