diff options
| author | Martin Stjernholm <mast@google.com> | 2020-01-31 12:44:19 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2020-01-31 13:28:49 +0000 |
| commit | 6bc1bfa5b89919daeffa662f84cc86ec2a4e72e3 (patch) | |
| tree | 6a62dd9bb6c6ca758e1d6b9ca9bbda03bdac6915 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 61719eca99b8c12ec8241d92b65c68a13c3fe40d (diff) | |
Reconciliate differences in code order wrt AOSP master. DO NOT MERGE
This should resolve the Automerger conflict in the merge path from
mirror-aosp-master. Cf. stage-aosp-master:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/61719eca99b8c12ec8241d92b65c68a13c3fe40d/telephony/java/android/telephony/CarrierConfigManager.java#3041
vs mirror-aosp-master:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/ae03bdf7c134bd29068915f6241669fb309009c6/telephony/java/android/telephony/CarrierConfigManager.java#2990
DO NOT MERGE makes this propagate to qt-qpr1-dev-plus-aosp which needs it:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/65da5d0a2c5da78335998995efb52f7246c3ca2f/telephony/java/android/telephony/CarrierConfigManager.java#3041
leaving master which already has it:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/c5f436ec5e91b957a3a214faa801f0271d7a0557/telephony/java/android/telephony/CarrierConfigManager.java#3036
Bug: 148598085
Test: Forrest build: https://android-build.googleplex.com/builds/forrest/run/L16500000445659922
Change-Id: I73d5098e265860d48d7dc687a9ded7a9ce903fca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions