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

This commit is contained in:
The Android Automerger 2013-08-29 06:01:01 -07:00
commit 4587e23aef

Diff content is not available