commit | 53678f5d46934097a3c4cbaba11bc7faa34afdc7 | [log] [tgz] |
---|---|---|
author | Xiangyu/Malcolm Chen <refuhoo@google.com> | Tue Apr 14 23:15:20 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 14 23:15:20 2020 +0000 |
tree | 8df9a86af2f20d2370ba9b65aebaf35ccf3390ee | |
parent | 4c60e831dea5aeb9ead4474f8b0148742332c60a [diff] | |
parent | f7c56da5bfb7c07d1004b94d928bdae896bb68be [diff] |
Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am: e9dc36d551 am: 23f35887a9 am: 9d27f4f358 am: e2eb20640a am: f7c56da5bf Change-Id: I576c065c301268b913107f31f582c1c8379fe203