OSDN Git Service

Merge "Add blocking and retrying wrappers for INetd uses." am: ba8c613e16
authorErik Kline <ek@google.com>
Thu, 16 Mar 2017 02:54:02 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Mar 2017 02:54:02 +0000 (02:54 +0000)
commit300c56a977373943ddedc137d7c0f05f5a3f242b
tree7351c0233d3815009fc630ff6b244515e9adc3f6
parent916aef7eb84dbe7adf4f483d7edd8f731047d79b
parent143d0853a2c2d0a8ff6169b2bd9498c5c04522ba
Merge "Add blocking and retrying wrappers for INetd uses." am: ba8c613e16
am: 143d0853a2

Change-Id: I8957b3506f92257cfa052580156d7a87645d11b2