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

This commit is contained in:
The Android Automerger 2013-08-14 06:06:12 -07:00
commit c337d8660a

Diff content is not available