tree 9cf553cd8f82957b7e1b4c9db16a8ab16d920b60
parent e5496f1e73f8adff98713975cc426f2d4c494d68
parent 5fa6de7421707721e1864dd350c1d88d04a0c879
author Hall Liu <hallliu@google.com> 1614825660 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614825660 +0000

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

am skip reason: Change-Id Iac1cdd643253fd186a164b863d65d6e92698fd38 with SHA-1 b7cffcab32 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6aacc3b1417f9d3b144e97ed0e5346567044ce2