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

This commit is contained in:
The Android Automerger 2013-09-19 06:01:50 -07:00
commit 7fa91dc3a7

Diff Content Not Available