diff options
author | 2018-01-25 23:19:27 +0000 | |
---|---|---|
committer | 2018-01-25 23:19:27 +0000 | |
commit | b98b5de9f3b99cd26502bd997882a8dd47dc9f0b (patch) | |
tree | cddcc3e030137a8f1fd5e16a339b31f34fade1bd /libs/androidfw/AssetManager2.cpp | |
parent | ece99d6601bcdc89773319eaca6541e5bfe85be0 (diff) | |
parent | 4f65db74216ddc77657f92565e69a5e982bfdec8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d6df52e22f -s ours skipped: 7f649e7e6d am: 5cd687505a -s ours am: 77803cc4fa -s ours
am: 4f65db7421 -s ours
Change-Id: Ia39df9681739abb613a586c02b72c103868befa0
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions