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

Trivial merge