am 1cfe4b2a: am e8f605ff: Merge change 23761 into eclair
am 1cfe4b2a: am e8f605ff: Merge change 23761 into eclair

Merge commit '1cfe4b2a75041b6853c304eeaee1ae84bbf5f2a8'

* commit '1cfe4b2a75041b6853c304eeaee1ae84bbf5f2a8':
  Fix compilation of add-resource tag.

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