OSDN Git Service

Merge "Switch back to the BSD exec for now." am: 0e99e40892 am: cb93629de5 am: 0da9105936
authorElliott Hughes <enh@google.com>
Fri, 26 Aug 2016 02:11:55 +0000 (02:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 02:11:55 +0000 (02:11 +0000)
am: 86f06d06d6

Change-Id: I33e6ed851a83ebb875600ac3510c477709f7ea36


Trivial merge