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

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

Diff content is not available