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

This commit is contained in:
The Android Automerger 2013-08-20 06:01:38 -07:00
commit fdbc68bf1f

Diff Content Not Available