Elliott Hughes 3080c001b5 resolved conflicts for merge of 82f8bca4 to master ...

Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210

2014-04-28 13:53:25 -07:00

..

java/android/net

resolved conflicts for merge of 82f8bca4 to master

2014-04-28 13:53:25 -07:00

jni

Use a single socket to communicate with supplicant

2013-08-08 18:38:53 +00:00

tests/coretests

Track libcore.os' move to android.system.

2014-04-28 11:11:32 -07:00