OSDN Git Service

Merge "Add timeout support to __system_property_wait." am: c9a840ac76
authorElliott Hughes <enh@google.com>
Wed, 22 Feb 2017 01:49:51 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Feb 2017 01:49:51 +0000 (01:49 +0000)
am: 39cacfe03f

Change-Id: I72714ab9ce57848b2d06e314e4aef86c4ec8016f


Trivial merge