merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-06-24 09:44:30 -07:00
commit 22476056b0

Diff Content Not Available