aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 21:27:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 21:27:23 +0000
commit9761ecbfa2f7b86f8aa5c83d05e471057fd11eef (patch)
treea65f885fc5239cb3c4c1e29dc9cce8b118976c47
parentc2f26db7f6d7366f9cd8f92b0629133614348b6a (diff)
parent21efd9c3b6f8ad5ec1d0c588e4fee3d2352ea10c (diff)
downloadlua-9761ecbfa2f7b86f8aa5c83d05e471057fd11eef.tar.gz
[automerger skipped] Merge Android R am: 9f50cf8d3c -s ours am: bc408a2767 -s ours am: 41426add0b -s ours am: 80163a04b2 -s ours am: 21efd9c3b6 -s ours
am skip reason: Change-Id I3d367a3babc9cb7ac6dbea396f70e10c5651d50b with SHA-1 129dd212d0 is in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1422381 Change-Id: I4e279e078b58b56cf622be6ce95138c8ba151ebd
0 files changed, 0 insertions, 0 deletions