tree 809a09ab636cb3dd82625dfd698791e4547b3c9d
parent 33cf8d2a6a87ba593dfc00bf91c0b2d81f70af63
parent 99f26cce5ac08f968b0cc0b722076ab586a68a37
author Yi Kong <yikong@google.com> 1544583430 -0800
committer android-build-merger <android-build-merger@google.com> 1544583430 -0800

Merge "Suppress expansion-to-defined warning" am: cd64d115bd
am: 99f26cce5a

Change-Id: I96c48f75ae5a23109b184162d8eb344bf33f9b93