am f7ad0aa0: am 10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread
am f7ad0aa0: am 10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread

Merge commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1'

* commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1':
  Explicitly mention again that startCommand() runs on the main thread.

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