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

This commit is contained in:
The Android Automerger 2013-10-10 06:01:47 -07:00
commit ae0871ef15

Diff Content Not Available