Todd Kennedy 519b589300 resolve merge conflicts of d22603ebd2 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6

2017-08-16 15:00:20 -07:00

..

android

Merge "Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310 am: e9291de0c4" into oc-mr1-dev-plus-aosp

2017-08-16 19:22:46 +00:00

com

resolve merge conflicts of d22603ebd2 to master

2017-08-16 15:00:20 -07:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…