tree 809a09ab636cb3dd82625dfd698791e4547b3c9d
parent e5b87a5a44fe5aa66c48fb4c9609c0426e174661
parent cd64d115bd08530d97d233e66e6161a6a98b1a67
author Yi Kong <yikong@google.com> 1544583122 -0800
committer android-build-merger <android-build-merger@google.com> 1544583122 -0800

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

Change-Id: Id965caeb56b28f2d92a6551df99d80b9bb1b2a80