OSDN Git Service

Merge "Revert "Switch back to the BSD exec for now."" am: 6313116b74
authorElliott Hughes <enh@google.com>
Fri, 26 Aug 2016 18:09:41 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 18:09:41 +0000 (18:09 +0000)
am: d11f678c52

Change-Id: Ic89b0b663ed82325e0ef5fb79ba078b33a00670f


Trivial merge