merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Tue, 5 Nov 2013 14:04:10 +0000 (06:04 -0800)]

Trivial merge