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

This commit is contained in:
The Android Automerger 2013-11-12 20:00:37 -08:00
commit c65f13943c

Diff Content Not Available