tree ba7e00e5d9839d22682774bd0ad394ab2a35d356
parent be1927e0e582f64830e25f5ad8c4376da5accf14
author Qi Jiang <qijiang@google.com> 1528166471 -0700
committer Qi Jiang <qijiang@google.com> 1528179693 +0000

Merge "Clear undesired test attributes in teardown test" am: 901c7ba75f am: 3f267e021a
am: d4a1e411ba

Test: None
Bug: 65563975

Change-Id: Iabf1a6fc7b33bcb96f032a59aca8e38d9c125452
(cherry picked from commit 15a27f0c11ed92437140b0608dc29b216bde3378)