tree 290f597bfee29a55d98f40cb660ed1500e8a29a1
parent bfca876038d4100ed484420bcbd1124e2ac7ee82
parent a51e44cef79b3d17e9908ee10a41c3d917337145
author Tao Bao <tbao@google.com> 1493858981 +0000
committer android-build-merger <android-build-merger@google.com> 1493858981 +0000

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

Change-Id: I38990e888541ba2f6428277eae65c3d840364b60