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

This commit is contained in:
The Android Automerger 2013-09-11 06:00:09 -07:00
commit 25519f0fb0

Diff Content Not Available