diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:39:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:39:03 +0000 |
| commit | 5f470bae4aa80c5850730c3c5e5964d25216e4ae (patch) | |
| tree | 689cf430f83c28b9ba9c88db7868bc72c1dcecfd /tools/aapt2/java/AnnotationProcessor_test.cpp | |
| parent | c092104a5d68730755002cdbff534335ff2ea4b0 (diff) | |
| parent | 4f9abbfb58813534c8c6e122db04f7aa10ee0e9f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519377
Change-Id: I2a343979692f971fab2373fbe5617566b0ccedd8
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions