Chris Tate 4bbae5eeed Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2 ...

am: 352a718

* commit '352a71807cb9d24863afdb10fd4cd76733f9ed43':
  Raise native-crash socket timeout

Change-Id: I15f7c2b1179553bc3a097fe9280ba4d7fc967145

2016-04-22 23:57:11 +00:00

..

java/com/android/server

Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2

2016-04-22 23:57:11 +00:00

jni

Merge "Unbundle RemoteService on TV - part 3" into nyc-dev

2016-04-22 21:02:04 +00:00

Android.mk

Merge "Move UidRange aidl declaration to system/netd" into nyc-dev

2016-04-19 19:19:43 +00:00