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

Trivial merge