summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-06 18:40:40 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-04-06 18:40:40 +0000
commit8d96a38173c6520c03d3c2870b06f8061820f117 (patch)
treeccfc2787f94dfd033e5110bf7b4e7367661d79ca /libs/androidfw/AssetsProvider.cpp
parent501fecf98936e727d2855c3d6a8631955a9d585e (diff)
parent18bd9876ce95749b9b6f6420b445e2e4c086fce8 (diff)
Merge changes from topic "presubmit-am-28395e19f737446e92e70dc9b28f2424" into sc-v2-dev-plus-aosp
* changes: [automerge] DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token 2p: 0cfda55b95 DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions