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

This commit is contained in:
The Android Automerger 2013-08-26 06:01:09 -07:00
commit 6941ec9f4d

Diff content is not available