aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 02:02:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 02:02:32 +0000
commit41426add0b2719b3872ff13751a1292c83b06651 (patch)
treea65f885fc5239cb3c4c1e29dc9cce8b118976c47
parent480a7dba9642ca5a5eeca9a43c1aa06bf0416204 (diff)
parentbc408a27674e9ed7b9ca866e91dfde8111d9b905 (diff)
downloadlua-41426add0b2719b3872ff13751a1292c83b06651.tar.gz
[automerger skipped] Merge Android R am: 9f50cf8d3c -s ours am: bc408a2767 -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: Id28be5d2f28bca0411455f98bfdb77517fb4056d
0 files changed, 0 insertions, 0 deletions