tree 66eceb85a34f090fb864c0e0d50e1941bd7a92e4
parent 6bea344d7e08e64f690920e7b3ea9b39de38643c
parent 1d33e0815d2032de7e4664f398ef7c08e5cfd258
author Tao Bao <tbao@google.com> 1493858801 +0000
committer android-build-merger <android-build-merger@google.com> 1493858801 +0000

Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581
am: 1d33e0815d

Change-Id: I93c7c3e0d66c4e7d59b1d97552036026cb15f96a