merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-18 06:00:28 -07:00
commit 00196d1a46

Diff Content Not Available