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

Trivial merge