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

This commit is contained in:
The Android Automerger 2013-11-07 06:00:31 -08:00
commit 8f163e89ba

Diff Content Not Available