| commit | 3f53b9957053f6747802fecfb98ac92ffa4dc8df | [log] [tgz] |
|---|---|---|
| author | Grace Jia <xiaotonj@google.com> | Mon May 03 22:54:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 03 22:54:59 2021 +0000 |
| tree | b60501963081991b884f54f4e541c5d758549afc | |
| parent | 22fd984bbd4a71dd0306674b893432d93b4b08ff [diff] | |
| parent | e4746bb624536eebd4243a7e235f32049df275aa [diff] |
[automerger skipped] Merge "Add support for D2D sharing contacts settings." am: 2b1353c909 am: 41b1bd1507 am: e260d06a62 -s ours am: e4746bb624 -s ours am skip reason: Merged-In I30330c568e577baa8d0f5f8982517ef8918ed9c9 with SHA-1 3eb232cfc9 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1694188 Change-Id: I3eeb9406fdb56a18d8c8dfd90fc18a186fb5b258