merge in klp-release history after reset to master

This commit is contained in:
The Android Automerger 2013-08-07 06:00:48 -07:00
commit b1747fbdcc

Diff content is not available