| commit | 98ab0c074bc2dcf0bfa8de1a62917100511566b2 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Thu Oct 22 22:46:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 22 22:46:33 2020 +0000 |
| tree | a56e81860353db890808389d8d62c8b848737baa | |
| parent | 914f3a64def991502ecc78b23a6754eb3c7c1809 [diff] | |
| parent | 2f70f9a72165047ffbe5fb3ce2cd74aa42dc8a6e [diff] |
[automerger skipped] Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc am: 4e254916f0 am: dacbfa7ed8 am: 2f70f9a721 -s ours am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 9d30001ad7 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469718 Change-Id: Iaaa83a28a354247279d26713db32746dadc02cee