OSDN Git Service

Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
authorTom Taylor <tomtaylor@google.com>
Mon, 31 Oct 2011 19:51:19 +0000 (12:51 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 31 Oct 2011 19:51:19 +0000 (12:51 -0700)

Trivial merge