tree d1aa57138878df74a2a9f3f935aacd827214cf77
parent ee4a4aee39771014c0c97ab9dcb8fa2f97fd7939
parent 56189d23563610a63064b9ef97e5851f21bcadc8
author Aart Bik <ajcbik@google.com> 1525110770 -0700
committer android-build-merger <android-build-merger@google.com> 1525110770 -0700

Merge "Step 2 of 2: conditional passes."
am: 56189d2356

Change-Id: I416a9e86307d1d7fc8cce414b6f2658dee8e471a