merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 26 Aug 2013 13:01:41 +0000 (06:01 -0700)]

Trivial merge