tree 90406a2f21e9d6b5b2f59b5567e452faba47f247
parent 445d25d0767f0502617036eccb5f40447952e8bc
parent dd08a0d4d3d851972613ffe2ac29674d5bdd6f17
author Tao Bao <tbao@google.com> 1493855647 +0000
committer android-build-merger <android-build-merger@google.com> 1493855647 +0000

Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073 am: 5f8d2932d0
am: dd08a0d4d3

Change-Id: I266ad9ef96c483ed03fa4c385f05d0a658da9cee