| commit | c71841bd897c17d3d121d1800ee5ab157ce2d6c4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:19 2020 +0000 |
| tree | 231a875a8482a6cf7ddf5d604135940a720372e5 | |
| parent | 15fdac4f3a3e130c80f05556031e9227b0a1b5e9 [diff] | |
| parent | 1d2eb677e56283da9555e06cf1d3f2ed0096f55e [diff] |
[automerger skipped] Merge "Merge Android R" am: 7c97cc5eb0 -s ours am: c3d0aa5d14 -s ours am: 1d2eb677e5 -s ours am skip reason: Change-Id I5fcf38b16c81c6b75624936a4f98e37bdb871340 with SHA-1 a2c57f54f5 is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1422479 Change-Id: I0c1f6cb9ff0fd1465b69407f482cc4421fc56d82