merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-06-26 07:07:28 -07:00
commit e4450b447e

Diff Content Not Available