Robert Greenwalt f7ca6f7ddf am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp ...

* commit '1a087f0f01e4ea6900e5d922df68cbe908d6d1c9':
  Add external dependency API.

2011-04-07 14:22:03 -07:00

..

java/android/net

Merge "Add external dependency API." into honeycomb-LTE

2011-04-07 13:02:28 -07:00

jni

Don't use local ref for cached jclass reference in JNI code

2011-04-06 10:04:20 -07:00

tests/coretests/src/android/net

Make LinkProperties comparable.

2011-04-07 12:36:56 -07:00