summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorYan Yan <evitayan@google.com>2021-03-02 00:12:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-02 00:12:32 +0000
commit768da4ffc04798f5540cad7ee1d5261d345fafa9 (patch)
treefb51f18c8e4d219e99acb87513aec5f91e323a87 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbcbfb511660a115e5614b7ab8b99f5cc38076bb5 (diff)
parent029885f8c792a34288a0f7e1d9ca3b9b9641aed3 (diff)
Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I413a7801db110980b3da7147b2ce29c867a1d2fc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions