am adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
am adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1

* commit 'adfe6383ee963b890bfbf319d219a23164804925':
  NPE in Threads.getOrCreateThreadId(Telephony.java:1275)

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