tree 17d70a1e7589cc5783f0827bed991e526323cea4
parent d8984641e79e11da3ac1d4abf03dd291f21df11b
parent 4c78e6e5a1f2484639576986a1de4c3d805e3a2c
author Bill Yi <byi@google.com> 1629315830 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629315830 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c78e6e5a1 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/15601351

Change-Id: I4502fc12c8ed5d5f0b4d3d10b1429b460da8b572