merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 16 Sep 2013 13:02:11 +0000 (06:02 -0700)]

Trivial merge