tree 6e3aaa122e222bf9bd2b03c271f22006f892d093
parent be73cb42572f50d8fb5e8c6a1bfc022107be8462
parent eae8fe3d01ba43df32e868eeb5a5f33a095beab8
author Jesse Hall <jessehall@google.com> 1526428852 -0700
committer android-build-merger <android-build-merger@google.com> 1526428852 -0700

Merge "atrace: map 'sync' to linux >= 4.9 fence tracing" into pi-dev
am: eae8fe3d01

Change-Id: I36652bfc94b07c84338e4bbdb57685d8018950a8