tree 939ef886ec6ac1ef19793963f4aebec76c79cf09
parent 73e3ed8e1c22c3419e57e94452ec4249c6f52563
parent 94d91a2c56d1ead7c16b1cf3368a61ae64dc079a
author Mark Salyzyn <salyzyn@google.com> 1463071551 +0000
committer android-build-merger <android-build-merger@google.com> 1463071551 +0000

Merge "liblog: sleep 20ms before critical property_set"
am: 1d560ff24a

* commit '1d560ff24a30dfac9f8e71847883ca4fef5f953c':
  liblog: sleep 20ms before critical property_set

Change-Id: I09197251d8ba5efb87c47e3e496bfe1c826e8688