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

Trivial merge