Merge "Fix empty resource showing "Und"" into tm-dev am: f71832b46b am: 0b6119192b am: a31e2c97c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983788 Change-Id: I7e56e6f192446e0f32c02789d039239f1289d549 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: