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

This commit is contained in:
The Android Automerger 2013-11-12 17:24:10 -08:00
commit f78ba11e70

Diff content is not available