merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-06-27 07:09:45 -07:00
commit 6b1c9400fb

Diff Content Not Available