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