[automerger skipped] Merge 10952656 am: 7cd89e545f -s ours am: dac9189bd2 -s ours

am skip reason: Merged-In I1203be9f04301db17050b860e06185e40d9b58d7 with SHA-1 cdbf42ff27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Tag/+/25092669

Change-Id: Ie2f58a2a523590e89956caeb5d9307e3278d6fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 657d18d7537c50337e54378f105780fe954e721b
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS