merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:02:07 +0000 (06:02 -0700)]

Trivial merge