tree 37df6f2cb537b808e3106a03092ea2734516cb33
parent 5851c47ec076eef4d22404b8ca8823618a8565ce
parent a0d33655107448d962e92cb9d1753448b0ddea8a
author Dan Willemsen <dwillemsen@google.com> 1495597113 +0000
committer android-build-merger <android-build-merger@google.com> 1495597113 +0000

Merge "Fix override warnings when two test suites share an output" am: 5f4274609f
am: a0d3365510

Change-Id: Ic0d36e8cfa0addc44e4e9b9b78591f4baf2adc0e