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

Trivial merge