tree 3069d5ec00b4635a6ad8ab2d6ea4aba25e88e03a
parent 035c62b5a9b3d8ab660ddeaed15705ada243e6bb
parent 6cb189e322d19ab54f8c0a72dc80cb1ff3e26aba
author Chih-Hung Hsieh <chh@google.com> 1549347459 -0800
committer android-build-merger <android-build-merger@google.com> 1549347459 -0800

Merge "Temporarily disable clang-tidy for dex_builder.cc." am: 171dfad60c am: e6d84ae4c9
am: 6cb189e322

Change-Id: I65741102dfe0989c82f4244ef4c45954129dd513