Jim Miller 524a0adeb5 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 ...

* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen

2011-11-10 16:15:14 +00:00

..

internal

am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

2011-11-10 16:15:14 +00:00

server

NetworkManagement SocketTagger: Migrate QTagUid support to JNI.

2011-09-15 02:29:03 -07:00