tree b90171e1840e143b302cef55824a4b2e3d2b0bf5
parent 28f752961555f8d92fd571bb5628533687d72d9e
parent 4a05738a8e95f771ccd436296dddd162b43e07ec
author Dan Willemsen <dwillemsen@google.com> 1495597443 +0000
committer android-build-merger <android-build-merger@google.com> 1495597443 +0000

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

Change-Id: I343856779ec7cde3ef0246ae583766906462a534