tree b5cf7120323a1788c600ae5040bfc8d85e1869d9
parent 7a1c2943ab9c1d695641c274e83daf944bf4ade1
parent 3642b990730349664e64ac5454c6e94c6cbc5eb0
author Tao Bao <tbao@google.com> 1493855197 +0000
committer android-build-merger <android-build-merger@google.com> 1493855197 +0000

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

Change-Id: I28a2be565c74a051c8b5e7a5633455eb86483a3d