merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-02 07:07:48 -07:00
commit 147637c3ba

Diff Content Not Available