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

Trivial merge