am 0d973ad6: am 373329d4: Merge change I736c525a into eclair-mr2
am 0d973ad6: am 373329d4: Merge change I736c525a into eclair-mr2

Merge commit '0d973ad63401af0a5f5b5bcdbac4acddccfbcec0'

* commit '0d973ad63401af0a5f5b5bcdbac4acddccfbcec0':
  update dox to account for different behavior between AVOID and TARGET modes

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