diff options
author | Brad Ebinger <breadley@google.com> | 2021-04-30 18:11:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 18:11:29 +0000 |
commit | e0f6dc071fb1c16189dec64980b561cb86ef935f (patch) | |
tree | 4172b0ea7d00461b456dc88f50a2402ff80d17ee /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | bdb2eff6a2655398f9f5fad56f0d57b865890493 (diff) | |
parent | c87158d0b0f5b74ad480157ce89869220dbe4e27 (diff) |
[automerger skipped] Merge "Bound Telecom logging recursion" am: 63dc1d5081 am: eb77c749aa am: c87158d0b0 -s ours
am skip reason: Merged-In I52f44dd02d0d860d0894e9b84fded8cf5ff5a18e with SHA-1 bde5c37520 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691210
Change-Id: Iee4b72839dbff9d096d317340b354a68b69dc315
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions