tree 4ebaede70f855f14cc55d6422e7fa475a833f851
parent d83c0a8715de444b80f9403e001add78a3aa3e72
parent ad878d5494c30c8ce3f50977900a89840f73e176
author Tao Bao <tbao@google.com> 1505339824 +0000
committer android-build-merger <android-build-merger@google.com> 1505339824 +0000

Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b
am: ad878d5494

Change-Id: I26f95122637228debd396ad07928273e1f776da1