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

This commit is contained in:
The Android Automerger 2013-08-22 06:00:33 -07:00
commit 13ea69528e

Diff Content Not Available