am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp
am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp

* commit 'c5b6267dac35300821e6b6e062370d0ee935acc1':
  Update resource name for renamed string.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base