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-06-03 20:33:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 20:33:02 +0000
commitbd97ff8bb232f643628690f48411d91e10712bde (patch)
treebf9bc4c17eb4ff49a6f26bcf350fb8231a988221 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0e6be72864eab0c411896ce74ec898d32020223a (diff)
parentafc55e6712dbb3238fef70f383af285903d69f8c (diff)
Merge "Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev am: c235831ae5 am: c6abcbab14" into rvc-d1-dev-plus-aosp am: 2d8e2673d4 am: afc55e6712
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689273 Change-Id: Ib724e2bf164c1bb37d31dc7d1eabad78f6573fd1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions