Commit 44900a4f authored by Yohann Roussel's avatar Yohann Roussel Committed by android-build-merger
Browse files

Merge "Keep InstrumentationTestCase in main dex am: cd1fc050 am: 5e583b06... 

Merge "Keep InstrumentationTestCase in main dex am: cd1fc050 am: 5e583b06 am: 22669b33" into oc-mr1-dev-plus-aosp
am: e8f27610

Change-Id: Id17a45f03d60c3a3047f9cd0fcd8f021f3aa75a1
parents f38ec565 e8f27610
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment