Commits
John Spurlock authored and Android Git Automerger committed a943b0337c7M
am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp * commit 'c5b6267dac35300821e6b6e062370d0ee935acc1': Update resource name for renamed string.
Showing diff todcea5eb5db0