summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 20:53:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 20:53:27 +0000
commitaae38beb23558f2afcb3963e01edec63b25058aa (patch)
tree64bb2db2589b38de4eac41706c3fa537d30a1693
parent62e1b70fcd5462905f2a88889cb209b5b556f0c8 (diff)
parent4ade706df05a5d23650b135d9444194d987894dd (diff)
downloadphotoviewer-aae38beb23558f2afcb3963e01edec63b25058aa.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 9d83a7b1a1 -s ours am: 4ade706df0 -s ours
am skip reason: subject contains skip directive Change-Id: I42ac6f1e171c405f34ff1268b7653158924d71e2
0 files changed, 0 insertions, 0 deletions