summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-20 13:26:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-20 13:26:47 +0000
commitf55ebfd2879f9694f72b2096beccfc0c320c3a61 (patch)
tree2845a601f4db20c73967fd1e954e8a0d26a5ca57 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3bce92e5e25a77479d046eb38725fcc5330cb198 (diff)
parent9044a829354bfe8784ef7be781a795564063af79 (diff)
[automerger skipped] Merge "Allow com.android.* classes in system_service stubs" am: c26b2e8f06 am: 2a29a6056c am: 9044a82935 -s ours
am skip reason: Change-Id I8b36cf7a4ff569d0b960455de09ed40592dd5a9e with SHA-1 f74130f525 is in history Change-Id: I41dc29843925112da3b6d405975db6cfde6a36f3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions