OSDN Git Service

Merge "Abort connecting to native daemon during shutdown" am: d763e341b5 am: 0e42b8bab5
authorTetsutoki Shiozawa <tetsutoki.shiozawa@sony.com>
Thu, 14 Sep 2017 10:33:39 +0000 (10:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 10:33:39 +0000 (10:33 +0000)
am: ce96d1dd9d

Change-Id: I46c3e0c4f7241d1dccaa3963c462028ca8f1322d


Trivial merge