tree 8e580ad509cc3c9b46819a02db7445e80c6d0e77
parent 7d4a354fd572ac0dc01f9b815a9e0af2d127bc5b
author Nicolas Geoffray <ngeoffray@google.com> 1493119747 +0100
committer Nicolas Geoffray <ngeoffray@google.com> 1493217269 +0100

Update frameworks/base to new compiler filters.

Also fix a merge issue with duplicated code.

bug:34715556
Test: build and boot aosp bullhead
Change-Id: I3b913878c83f708e752ec06f79bada1873213823