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

Trivial merge