tree 809d66d935424759353906b4cc2aad11487883ae
parent cc2ca23b1e928857b371407ecb812e887680b1e2
parent 3b3bffc0d09bed8b9d7737cd5319674f17365ddd
author Paul Duffin <paulduffin@google.com> 1497517785 +0000
committer android-build-merger <android-build-merger@google.com> 1497517785 +0000

Merge "Add junit/textui/** to the proguard filter"
am: 3b3bffc0d0

Change-Id: I9b04203701bc38b7b2630ce78513c8f519d10822