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

This commit is contained in:
The Android Automerger 2013-09-16 06:02:26 -07:00
commit 0e88a58c01

Diff content is not available