tree 17d96130ce00646fc5cc64201f0ea871d1ce003d
parent f305711ae5675655a0bf3a64b525840f5749c78a
parent bfbf7c2c9a8c5b8216e1188c71a5d78ee82723e5
author Joel Galenson <jgalenson@google.com> 1513881078 +0000
committer android-build-merger <android-build-merger@google.com> 1513881078 +0000

Merge "Fix surfaceflinger on integer sanitized builds."
am: bfbf7c2c9a

Change-Id: Iae676c5bfecfceb6f2c158755609c1331aa6a787