OSDN Git Service

Merge "Fix ffs on x86 for old API levels." am: c2828b87ec am: 3127168bba
authorElliott Hughes <enh@google.com>
Mon, 10 Jul 2017 20:22:01 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 20:22:01 +0000 (20:22 +0000)
am: d93127bf90

Change-Id: I5144b29ecfdbcb75f30bfffbc261db260f3ea221


Trivial merge