summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2018-01-25 22:40:03 +0000
committer android-build-merger <android-build-merger@google.com> 2018-01-25 22:40:03 +0000
commit1860adf0cd381f19ec6d7a4aa9e6a9b9cb42b70e (patch)
tree1ab3b7c7fcaddb5680b4dbefe8c37efa6d45150e /libs/androidfw/AssetManager2.cpp
parent22c5a224c7cc365205432758804acd9afe13a140 (diff)
parentf19c7ab533f09aa2e45dcd992279355883a44a6d (diff)
[automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5 am: 6f59280206 -s ours
am: f19c7ab533 -s ours Change-Id: I25a06490c9bed46c67d6b8ab7a541015e45086c3
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions