diff options
author | Cody Kesting <ckesting@google.com> | 2021-04-01 19:32:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 19:32:05 +0000 |
commit | 1230749c3549045a6258ebfca1ec50b50d2e980b (patch) | |
tree | 43f7f068a40ada8a083230e8fbe7a78a180da50c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6b046fea4b473693100534b7e948382f149f801b (diff) | |
parent | 2fa4b7b7575b67b33995f88ab382a67739c7770f (diff) |
Merge changes from topic "gateway-connection-id" am: 03f00e5a52 am: 2fa4b7b757
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659162
Change-Id: I0e8e12f1514d597a9daebb91a7ab5f4728c274e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions