am 5b907be8: Merge "Move the main thread check to the appropriate place." into honeycomb
am 5b907be8: Merge "Move the main thread check to the appropriate place." into honeycomb

* commit '5b907be8f5c387e7580a8e43935250adabc408c8':
  Move the main thread check to the appropriate place.

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