tree 675e62e11cbbdf196a5475d299c517635df1c8c2
parent 5966ef774e8fb881a39d12a2eef7470028ba628a
parent dc8086745d960972791125cd45da0f2c6d801c7f
author Colin Cross <ccross@android.com> 1518637215 +0000
committer android-build-merger <android-build-merger@google.com> 1518637215 +0000

Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" am: eefc171d1f am: 1acf954411
am: dc8086745d

Change-Id: Ia0e236748488f8acfc4dde6de052a3f70c23c019