Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp * commit '189de2820932fd5dc98b9639fdc420a57cfa2316': Fix for a Resource system bug that displayed the wrong name for missing asset.
Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp * commit '189de2820932fd5dc98b9639fdc420a57cfa2316': Fix for a Resource system bug that displayed the wrong name for missing asset.