tree 90ca141420d18075aaac8f5b47d77f4af26be33c
parent aace11b35cd87cf51c6ee4bc7522d4fc43a8453c
parent 2c28bd6d4d3826a321df2446dbdc22ec866a034b
author Xin Li <delphij@google.com> 1598556343 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598556343 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 9e3105adad -s ours am: 1a04a62d71 -s ours am: 2c28bd6d4d -s ours

am skip reason: Change-Id I011de9865ebcecc37d325c769a357546abe02487 with SHA-1 a42f9088a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/slang/+/12469983

Change-Id: I2627f6c0e9500ce36d747915fbfade5764dd5356