tree 75ac66eec7d9d1b88185b9e2de10bb69156270c5
parent 53b98de8660be952384f2b48bf9d649bd62bcce1
parent 7c421985812d866c2c7da1f23ef2539e0f6eee09
author Tao Bao <tbao@google.com> 1493858650 +0000
committer android-build-merger <android-build-merger@google.com> 1493858650 +0000

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

Change-Id: I89eb2acace8e53a2af00fd681e6298edc157f8ac