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

Trivial merge