tree 502ad2abc705d5bfa2f3fa664bb0aa505024e093
parent d505cb71a35f6d280a45a2b4464dc16473b82381
parent e5496f1e73f8adff98713975cc426f2d4c494d68
author Hall Liu <hallliu@google.com> 1614831709 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614831709 +0000

[automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 -s ours am: e5496f1e73 -s ours

am skip reason: Change-Id Ie82dded77a3eaa75095333b0e77f10e21c9f7caf with SHA-1 a3986a5def is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554969

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf761e62b7520ec9cf855deb41e45d3fa7ef078