tree e9432587c5194137441413e00b2efa48a246636f
parent 8c4b349f4638e3b94aa1967d22dfd36d4c249177
parent cdfb5e6d295e3154f8ae27e34d3ead89c6d2d0f8
author Brad Ebinger <breadley@google.com> 1562969206 -0700
committer android-build-merger <android-build-merger@google.com> 1562969206 -0700

[automerger skipped] Merge "Mark DDS PhoneAccount as CAPABILITY_EMERGENCY_PREFERRED" am: 628cd1a629 -s ours am: d3af1ced7b -s ours
am: cdfb5e6d29 -s ours
am skip reason: change_id Ia01416069eeceb3a8e01b7e2aa0121b2ab43289c with SHA1 cde27691e3 is in history

Change-Id: I89d1b0a83635ef20b7ca6373018f7850be4ed4b2