merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 04:14:10 +0000 (21:14 -0700)]

Trivial merge