merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 2 Oct 2013 13:01:46 +0000 (06:01 -0700)]

Trivial merge