diff options
| author | Roshan Pius <rpius@google.com> | 2021-03-22 03:55:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-22 03:55:23 +0000 |
| commit | efd2d89db8506fe2e4f87ba75fbe9bb8d3b041e5 (patch) | |
| tree | 47783fafd5c9b6b5dccac2f815093e20f23f2339 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1ff4cc3ff2c019cdbf2d6b7d028156a7faa05655 (diff) | |
| parent | fdc5eb6e5667c2fef1ab6db978f98eb3ccbd2968 (diff) | |
resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-aosp-master am: fdc5eb6e56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944446
Change-Id: Ia4f30adab268c9c51d89d61355a48da00b855190
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions