merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-22 06:01:44 -07:00
commit c6c5161c33

Diff content is not available