[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am: 4468002f09 -s ours am: 4737af2aec -s ours am: bac33cae44 -s ours

am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history

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

Change-Id: I31bc01d9e3d06bb97b49d88e6b502384766d4d60
tree: f5cba6c87549b8ba320653ae13c7884f7dca1e96
  1. oem_template/
  2. src/
  3. testing/
  4. Android.bp
  5. Android.mk
  6. OWNERS
  7. proguard.cfg
  8. README