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

This commit is contained in:
The Android Automerger 2013-10-13 19:20:47 -07:00
commit d43b1dbc6b

Diff content is not available