summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2021-10-04 18:51:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-04 18:51:07 +0000
commit22d3697390aa91023ba3b15740d20bf7ee74f2b0 (patch)
treed6d5a30d50950d0f9093025da7d7daa8cb692824 /tools/aapt2/ResourceTable.cpp
parent2393bd215847a7e7d667d717279c8a6072d1cb07 (diff)
parente57570bd60ea1df31adfaf42c9908b9fe96efabb (diff)
[automerger skipped] Merge "Revert "Fix shared transition offsets in landscape"" into sc-v2-dev am: 648874c47c am: e57570bd60 -s ours
am skip reason: Merged-In I47dedda772d4b62dbf134f9ea5cc9293b27cb277 with SHA-1 c356ad4c9c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611766 Change-Id: I716379c53a81d77ad529f52564b65ec8afc5186a
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions