tree 139eb51e765b9ca06ab4bc98e24dadab93f56cd6
parent 7cd4536e80eebb3cfb6df451560a159d2c27efd3
parent 6690a19c68df8ab12d39d9cbf22fb7ebb4bc3fba
author TreeHugger Robot <treehugger-gerrit@google.com> 1482161463 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1482161466 +0000

Merge "Use junit instead of junit4-target"