summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-13 02:37:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-13 02:37:28 +0000
commiteaffe8786fc65ffa983847ebbe09b4303c768f8f (patch)
treec56b0bb6514fac0e28ca48776d62222ac168f47f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb598b8445726c3847818db55e0bd380a0f125481 (diff)
parentde86bdb681778fddd4f8128be51f1aad441d43f7 (diff)
Merge "[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5 am: b6d1814cef -s ours" into rvc-dev-plus-aosp am: 456051ffc8 -s ours am: de86bdb681 -s ours
am skip reason: Change-Id I305ff855f0d5595be13b6ee4e4480abd89ed258f with SHA-1 2387cdee2c is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331803 Change-Id: Ib09ad034240d611bb7a338aa38b7e7b6b6aa1ca3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions