am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo

Merge commit '785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken

* commit '785c89835741ca735fbb766bc2e1aeb68a4d5169':
  remove myname accidentally included in one of the files

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