merge in klp-mr1-release history after reset to klp-dev

This commit is contained in:
The Android Automerger 2013-11-05 06:03:41 -08:00
commit 6a54ed4214

Diff Content Not Available