diff options
author | Philip P. Moltmann <moltmann@google.com> | 2017-12-20 19:31:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-12-20 19:31:34 +0000 |
commit | 7467d044960b577fbc526813c4c67633b5f7d9e7 (patch) | |
tree | 843d69d3dd179595c156bc37eaa2c9dc33bad701 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6b93e3931e4ae002f8465139598a1104c4c5ae2f (diff) | |
parent | 30d2c140063853b65fe08cfbd9e5dd2e3b227ef0 (diff) |
Merge "Don't include mockito in frameworks-base-testutils" am: f924642729 am: cf7aa7c09e
am: 30d2c14006 -s ours
Change-Id: Id53b8f79a485f48d942d592d4ab6192f8545e356
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions