Lorenzo Colitti c901766a37 am 9fa0471a: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration." ...

* commit '9fa0471a1577ef3008575a01bb84cbc8fad5138f':
  Add a unit test for StaticIpConfiguration.

2015-02-05 02:41:31 +00:00

..

java/android/net

Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c40bd27 automerge: 5b392ee

2015-01-30 15:59:49 +00:00

jni

Remove hardcoded include paths.

2014-12-31 10:06:51 +00:00

tests/coretests

am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."

2015-02-05 02:31:40 +00:00