tree b56f2c18dc576f301e1fd8c28626acea90f692f8
parent 110c79b86b8531d108c390e31eb6d4f57763f694
parent 52ce62558b11d3adbc2c8518fdda65e4e9785d0f
author Christopher Ferris <cferris@google.com> 1488227277 +0000
committer android-build-merger <android-build-merger@google.com> 1488227277 +0000

Disable macro redefined warnings on some includes. am: dcb1861257 am: 6971b06a6d
am: 52ce62558b

Change-Id: I8c3f26bb48636b9ad1e20f411e23ea44f9c1bae2