Robert Greenwalt ba7913f987 resolved conflicts for merge of 248d8d2c to master am: 1bf31d7571 ...

Original change: undetermined

Change-Id: Ida8af1276fd2b3f0758fa72c8f5cf26dfd3dab75

2021-05-31 06:23:23 +00:00

..

java/android/net

resolved conflicts for merge of 248d8d2c to master

2013-07-19 14:09:30 -07:00

jni

Merge changes Ia6646363,I94389b64 am: c4f78f6100

2021-05-31 06:21:50 +00:00

tests/coretests

Fix LinkProperties's equals() method.

2013-04-02 10:08:59 +09:00