summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Fabian Kozynski <kozynski@google.com> 2019-05-20 14:17:43 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-20 14:17:43 -0700
commit30edf328bbdf2b92d107353414b3c75af34daddc (patch)
tree956cc7068aa2a16a8f3446f3c4680a4c054be3dc /libs/androidfw/AssetManager2.cpp
parent133644c05abf25776a731a68a8d29b4333ab2731 (diff)
parent36e43b436f404981d1ee671cab7297d692de1aa5 (diff)
Merge "Make ResourceIcon#get thread safe" into qt-dev am: 426431ea29 am: fe12ead641
am: 36e43b436f Change-Id: If10a05ee359508ff3d395c65cf7cc41263f7326d
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions