tree 3764894fd46756e767bb147bd4a18882b80bcb9e
parent c730b84f7c1b3cc5a0d2c0c8f2a7fd7378707b03
parent 4008acc1a9c898aaa788c3c20b0427c85fad8773
author Dan Albert <danalbert@google.com> 1470936698 +0000
committer android-build-merger <android-build-merger@google.com> 1470936698 +0000

Merge "Put bsd_signal back in android-21+."
am: 4008acc1a9

Change-Id: I11a5a570366a073a15ed370b7acdeedef023ac89