tree 83d7ce1cf71a7e4d8e4886a39dad08df268a85e5
parent e4add524e99cb4e2eb96ae44790287684c22976b
parent 372b6b2c45b1714fc48f7d99dae0140edf56bcc2
author Paul Duffin <paulduffin@google.com> 1487606346 +0000
committer android-build-merger <android-build-merger@google.com> 1487606346 +0000

Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
am: 372b6b2c45

Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea