OSDN Git Service

Merge "Remove a workaround from stack_protector_test that\'s not needed in master."
authorElliott Hughes <enh@google.com>
Mon, 4 Apr 2016 19:52:26 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Apr 2016 19:52:26 +0000 (19:52 +0000)
am: e5f7938

* commit 'e5f79381db04d925a60116910626114965d934dc':
  Remove a workaround from stack_protector_test that's not needed in master.

Change-Id: I3c18d0152fe1e9823825f2475b7f9c7f78a06abe


Trivial merge