tree cf983deda765c24f489fcd8b66983d43b06a9e59
parent 8d5223b8e2e37a51fae06fc370d512c94a556ab8
parent c1567549d032042700cb5189b8fd817a8efcec95
author Andreas Gampe <agampe@google.com> 1518130404 +0000
committer android-build-merger <android-build-merger@google.com> 1518130404 +0000

Merge "Include <byteswap.h> on Android." am: a56b371c82
am: c1567549d0

Change-Id: I49024d6257f23d17b7a5f8d362abd189f20ecc60