tree 5867757ae9150f885f537322d9b71b73f81f79ac
parent 7d9588c83648401337f93ecb16d854155f4d603a
parent 24660e5bb7c99c589291b608b794333cc8f32d9d
author Hugo Benichi <hugobenichi@google.com> 1507810400 +0000
committer android-build-merger <android-build-merger@google.com> 1507810400 +0000

Merge "Import a few android.net unit tests into frameworks-net"
am: 24660e5bb7

Change-Id: I41655938d6d1df19130847210437f047c8b65cdf