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

This commit is contained in:
The Android Automerger 2013-09-24 06:02:15 -07:00
commit 61c24928c8

Diff Content Not Available