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

Merge commit '373329d477d2db20c66a85aa3e23a696d76a9954' into eclair-mr2-plus-aosp

* commit '373329d477d2db20c66a85aa3e23a696d76a9954':
  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