merge in klp-release history after reset to master
The Android Automerger [Mon, 22 Jul 2013 13:01:51 +0000 (06:01 -0700)]

No differences found