tree c7a46006e27031db4b9ccf75616db1f12f5df225
parent 2670278628e07f0d4149df6c4b435213c4cb43ad
parent 2228ea824d1f840f874fa05bdd92e0af016e6c84
author Yohann Roussel <yroussel@google.com> 1496311038 +0000
committer android-build-merger <android-build-merger@google.com> 1496311038 +0000

Merge "Keep InstrumentationTestCase in main dex" am: 64c9ca5a1c am: 756f943b05 am: 6aa22f2fd0
am: 2228ea824d

Change-Id: I5566a4520e07958dcbc3ebf10aa4cafe2c61885c