tree afb2db81aae4ab41d13efd652e06543d1009d50d
parent 27cd4e6d3495cb58f436cbd40850c5e239f2ea75
parent a3b5695019a9104e231768ce999564898eb4433b
author Colin Cross <ccross@android.com> 1528433841 -0700
committer android-build-merger <android-build-merger@google.com> 1528433841 -0700

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

Change-Id: Ic0fca09f12ddc5793e4946359258a24ea1047050