merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-07-16 06:00:36 -07:00
commit 7256fbd9b2

Diff Content Not Available