Jeff Sharkey b01cb2c0c2 am fce708d2: am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" ...

* commit 'fce708d285506f65eb51a3256b2a04111e4054cc':
  Check for null in LocalSocketImpl.SocketInputStream.available()

2014-05-21 17:15:19 +00:00

..

java

am fce708d2: am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"

2014-05-21 17:15:19 +00:00

jni

Merge "USB: Fix race condition in acquiring global reference in UsbRequest JNI code"

2014-05-20 18:59:05 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-05-21 15:34:06 +00:00

tests

Style fix and dead code removal

2014-05-21 22:56:40 +09:00