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

This commit is contained in:
The Android Automerger 2013-08-08 07:54:13 -07:00
commit ff97e621c0

Diff Content Not Available