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

* commit '9653a1d4b1d87111bb90d9cc0be89d2e5fabba8f':
  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