tree c0a3555895dbb4c75144539fc7b3351d2747db16
parent 03f740ec3d0a4191e46615e961bd9f6bbf64d63c
parent 5f8d2932d0a49159ec6aeae0af177656e4fb23e4
author Tao Bao <tbao@google.com> 1493855317 +0000
committer android-build-merger <android-build-merger@google.com> 1493855317 +0000

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

Change-Id: Ib13d560262af5b9dbe762a7d7b01831b4791ba2f