merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 22 Sep 2013 17:51:46 +0000 (10:51 -0700)]

Trivial merge