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

This commit is contained in:
The Android Automerger 2013-09-29 06:01:19 -07:00
commit 08db4d4ef7

Diff Content Not Available