am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':
pull/91/head
Jie Dai 11 years ago committed by Android Git Automerger
commit ea45d54168

Diff Content Not Available