tree 459787f24159f107babcb4c985d1d73f36419de5
parent 2211b0b162ed210d656a7a9d40cb7035417c4324
parent f1429b1c31511c5675bced83c94cab6013bd5099
author Anton Hansson <hansson@google.com> 1531303163 -0700
committer android-build-merger <android-build-merger@google.com> 1531303163 -0700

[automerger skipped] Merge "Split generic_no_telephony in two."
am: f1429b1c31  -s ours

Change-Id: Ibd7b64a9813ee45cfe001f307be821260c76cddc