summaryrefslogtreecommitdiff
path: root/packages/SystemUI/scripts/new_merge.py
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-02-09 16:46:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-09 16:46:53 +0000
commitdf185d750273ecb7b2c61e98206ee9c11d76217b (patch)
treef6f93ae276d0e3d5721e7afa526397d39e9fc338 /packages/SystemUI/scripts/new_merge.py
parent024d22fdb76a75f72ac1a421c4dd184bbfe2ba12 (diff)
parent6f6c0cd4b8f59a6d6bb67196177ee964f6704da3 (diff)
Merge "avoid race condition on very fast tests"
Diffstat (limited to 'packages/SystemUI/scripts/new_merge.py')
0 files changed, 0 insertions, 0 deletions