| commit | 4083e5942d2176927f16d70361ed25d1e40e3bf8 | [log] [tgz] |
|---|---|---|
| author | Rambo Wang <rambowang@google.com> | Tue Jan 21 17:12:08 2020 -0800 |
| committer | Rambo Wang <rambowang@google.com> | Tue Jan 21 17:23:14 2020 -0800 |
| tree | 3c735b347efa5e709bd8620113e516b4b00018da | |
| parent | b5ebb17633e077c2fc6583e7da1ae85e7d90f1b0 [diff] | |
| parent | 5a104286422e991b32e8fdb1d1120056ca17ab93 [diff] |
resolve merge conflicts of 5a104286422e991b32e8fdb1d1120056ca17ab93 to master Bug: None Test: atest com.android.internal.telephony.TelephonyRegistryTest Test: atest android.telephony.cts.PhoneStateListenerTest Change-Id: Ibd9b67ce9be1d8ad718da45d494fc2bfe75f0959