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

This commit is contained in:
The Android Automerger 2013-09-02 06:01:11 -07:00
commit 4e02e51d14

Diff content is not available