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

This commit is contained in:
The Android Automerger 2013-10-03 06:02:17 -07:00
commit 25274b00b0

Diff Content Not Available