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

This commit is contained in:
The Android Automerger 2013-08-19 06:01:39 -07:00
commit 152cd76544

Diff Content Not Available