tree 43ffda2343ed7bfca4969d92f473bb5152af1e3d
parent febc43c5a7eae030f32918b02f1684cb0b5ea751
parent 5107b366b7cd0591eb5b8cd3326b409969d760fc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578549159 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578549159 +0000

[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: b50cb883b5 am: 20a1e9943d -s ours am: 5107b366b7 -s ours
am skip reason: Change-Id I5c3514bc8ea61d1bbbf1d1bf7e466a319046fb97 with SHA-1 3ab296d073 is in history

Change-Id: I8e077709c16a79dbd4617a4530d1a41226544cec