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

Trivial merge