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

This commit is contained in:
The Android Automerger 2013-09-05 06:01:25 -07:00
commit b7524ec3e2

Diff Content Not Available