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

This commit is contained in:
The Android Automerger 2013-10-07 06:00:11 -07:00
commit 92099b53f7

Diff content is not available