tree afb2db81aae4ab41d13efd652e06543d1009d50d
parent b6a21c423fade04f86c50f77b60b3bec7394e0ed
parent 3c7d4d0dbc8c8f0f837d3b251418ebe19dea61d2
author Colin Cross <ccross@android.com> 1528438955 -0700
committer android-build-merger <android-build-merger@google.com> 1528438955 -0700

Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests" am: 74ebf7a282 am: a3b5695019
am: 3c7d4d0dbc

Change-Id: I07d33f34b8cc38c7da89ba60b73bb1116642c04f