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

This commit is contained in:
The Android Automerger 2013-08-08 07:53:11 -07:00
commit b683cf117d

Diff Content Not Available