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

This commit is contained in:
The Android Automerger 2013-10-09 06:01:16 -07:00
commit e0df32c9a7

Diff Content Not Available