merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-06-19 07:40:48 -07:00
commit 6e06d4b106

Diff Content Not Available