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

This commit is contained in:
The Android Automerger 2013-10-08 06:00:18 -07:00
commit 303f08b439

Diff Content Not Available