merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-15 06:01:35 -07:00
commit 07cfca3cfa

Diff Content Not Available