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

This commit is contained in:
The Android Automerger 2013-08-13 06:02:27 -07:00
commit b45bd30a00

Diff Content Not Available