merge in klp-release history after reset to klp-dev

This commit is contained in:
The Android Automerger 2013-10-03 06:03:01 -07:00
commit e26b750805

Diff content is not available