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

This commit is contained in:
The Android Automerger 2013-08-14 06:04:54 -07:00
commit de19a0c55d

Diff Content Not Available