merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 00:39:56 +0000 (17:39 -0700)]

Trivial merge