am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread

Merge commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1'

* commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1':
  Fix for a Resource system bug that displayed the wrong name for missing asset.

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