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

This commit is contained in:
The Android Automerger 2013-09-29 06:00:40 -07:00
commit 861e7171f1

Diff content is not available