tree c71520c3a6249b6ce50cfaf49924f14e85e3efcd
parent 7b72ea43238345a8a4f2f9ea403f8c8a024a8558
parent d37ce77ebdba13ef790e180494157ba29f06b3e8
author Christopher Ferris <cferris@google.com> 1488226625 +0000
committer android-build-merger <android-build-merger@google.com> 1488226625 +0000

Merge "Disable macro redefined warnings."
am: d37ce77ebd

Change-Id: I0e644400c4d7a487d5676b5705a650c8e185ec3a