am 7f66dbce: Merge change Ic37381fb into eclair
am 7f66dbce: Merge change Ic37381fb into eclair

Merge commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9' into eclair-mr2

* commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9':
  docs: fix doc error in dialog example snippet

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