tree c2381965e7494cf72c30a1458695cc6428d80eea
parent b5110708c5148c663463208a1826a660c428581e
parent 31ac1cdb15be7e7fb13eb6e3d77b02efb82d8dda
author Elliott Hughes <enh@google.com> 1470874840 +0000
committer android-build-merger <android-build-merger@google.com> 1470874840 +0000

Merge "Remove __static_cast macro from <sys/cdefs.h>." am: 18af5bfa5d am: 4fe10a4c89 am: ed1e43bf24
am: 31ac1cdb15

Change-Id: Ic7f57eab7da208ae474945bcb790137a9dc837fa