tree d589e01287629836f715ff0615d59f80c53f13d1
parent b8e21a71883dcc079b4d048134cb86c05c20eac1
parent 765a97693622c24a5070a46d01afcc56d7369ead
author Paul Duffin <paulduffin@google.com> 1515849035 +0000
committer android-build-merger <android-build-merger@google.com> 1515849035 +0000

Merge changes from topic "fix-legacy-android-test-spam" am: 22bd015cba am: fdc58270ef
am: 765a976936  -s ours

Change-Id: I5fe3e5d0e1b955a279646c6d1701f79c1700a773