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

This commit is contained in:
The Android Automerger 2013-09-25 06:02:50 -07:00
commit 7f1aa4cbd8

Diff Content Not Available