Merge "Add tablet-specific version of string" into tm-dev am: 05f0f0926b am: 3ec8f9d54f am: 73e23da6d6 am: 39d1f8237a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152968 Change-Id: I1ca5a6b3e75fbbf36da0485e0dc6f6b4ff898509 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: