commit | 5bcd1cefdc4ef60acc705af63ff1fbd7517d9a76 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri Dec 01 16:59:45 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 01 16:59:45 2017 +0000 |
tree | 00bff09344a53e54f0043fb880cfc63162c5d756 | |
parent | 1ce4e084b0367a11116eff1e91f71469a7329d4d [diff] | |
parent | 8e3f26325b084dda562a8a4e37ffd622c0c0b065 [diff] |
Merge "Stop defining local "unused" macros now this is C++." am: 3183c567b0 am: b32552496c am: baef528071 Change-Id: I00116bfdb71ae08c4a2f148644af3ce01b10078e