[automerger skipped] Added string token to CARD support multiple languages am: 33c9adcaa9 -s ours
am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 a0354d4d5c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21931105
Change-Id: If852448949c0db99892e0d6a4af20a81b74551ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: