merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 04:11:30 +0000 (21:11 -0700)]

Trivial merge