tree 3886bbbc4832689fb50eeff3e185cb50fc7786ba
parent 78cb9787b987048e99106cb6f5d3d6cddd2b5865
parent 6c99b4bc49e64666e75941d8fee4606c0e7e7a29
author Paul Duffin <paulduffin@google.com> 1487766295 +0000
committer android-build-merger <android-build-merger@google.com> 1487766295 +0000

Merge "Filter JUnit and android.test classes from applications using proguard" am: 38a231d6c3 am: 3e93d553ec
am: 6c99b4bc49

Change-Id: If3985352b27f1de5ea1e9d8c6834c08f5dbcb34f