tree c137ba085b2176594ae1ed307e95b786e6680519
parent ef0d3c20c4594473218d0db97b805e6886805c06
parent 4fe10a4c894fef3087d28515b8c0504259f7ce36
author Elliott Hughes <enh@google.com> 1470874469 +0000
committer android-build-merger <android-build-merger@google.com> 1470874469 +0000

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

Change-Id: Ia700223faf6a274058721ab2fba47b1595b3e23d