Elliott Hughes 998a1baa9c am 26c330a4: am ccffea7a: resolved conflicts for a884d81e to stage-aosp-master ...

* commit '26c330a4248b79a14ac13c6ef30d522e4bba92d2':
  constify JNINativeMethod function pointer tables

2015-09-24 17:23:00 +00:00

..

java/android/net

Hotspot 2.0 relase 2 first cut.

2015-09-22 17:24:22 -07:00

jni

resolved conflicts for a884d81e to stage-aosp-master

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

tests/coretests

Turn off failing tests in FrameworksCoreTests.

2015-07-31 18:13:30 -07:00