commit | 05c7ac812fd66019c4aebe598068ddb8eebdeec9 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Fri Jul 12 15:06:31 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 12 15:06:31 2019 -0700 |
tree | c2ab710805b1f169f158be1a514a7a3ad79344bd | |
parent | bcc5cadd0c3a1410128a76753cc6e011c47f71b0 [diff] | |
parent | 6f006f0df5945522521094bf3f96693f14fe054a [diff] |
[automerger skipped] Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" am: 5b5889fc63 -s ours am: e02370196f -s ours am: 6f006f0df5 -s ours am skip reason: change_id If70d917cfb3d825f375d282012b8788d69a2f144 with SHA1 499881f1da is in history Change-Id: I1dfc3ce2d008d815dd6f9c53d99d123f5cb7f7b8