Elliott Hughes 9653a1d4b1 am 830ed7c8: resolved conflicts for a884d81e to stage-aosp-master ...

* commit '830ed7c82f13e162017a609420ebf46d10b0f4bf':
  constify JNINativeMethod function pointer tables

2015-09-24 17:14:10 +00:00

..

java/android/net

Add an error code for generic hardware error.

2015-09-09 00:16:57 +09:00

jni

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

tests/coretests

Fix use of reachable DNS server logic

2015-06-30 12:12:37 +09:00