OSDN Git Service

Merge "Temporarily disable InetDiagSocketTest." am: 5f2ae0dfbd
authorLorenzo Colitti <lorenzo@google.com>
Thu, 4 Apr 2019 04:20:34 +0000 (21:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Apr 2019 04:20:34 +0000 (21:20 -0700)
commit91b050f9c71a8ced303211f3b20443755c6980e0
treef7fec5d376889015ed506da8b6a55940f84a0ae8
parent6c6dcce516350ba88167d7f90538fb285f274859
parentb318f8a490d9a5917716a6459943dd5724587f3d
Merge "Temporarily disable InetDiagSocketTest." am: 5f2ae0dfbd
am: b318f8a490

Change-Id: I641da63d15ffbe6d5d2c8f39aeb39cb0a253899f