merge in klp-release history after reset to klp-dev rel-tegranote-r4-partner daily-2014.02.24.0_rel-tegranote-r4-partner daily-2014.08.05.0_rel-tegranote-r6-partner
The Android Automerger [Sun, 13 Oct 2013 13:02:50 +0000 (06:02 -0700)]

Trivial merge