[automerger skipped] Merge "Split generic_no_telephony in two."
am: f1429b1c31
-s ours
Change-Id: Ibd7b64a9813ee45cfe001f307be821260c76cddc
This commit is contained in:
commit
3ca5df4c40
am: f1429b1c31
-s ours
Change-Id: Ibd7b64a9813ee45cfe001f307be821260c76cddc