tree 473c3fd99203a900a61685301d5feb149c5b3f28
parent 41392611b550beaadc40ac762a6f691622484e90
author Pawin Vongmasa <pawin@google.com> 1506601871 -0700
committer Pawin Vongmasa <pawin@google.com> 1507853632 -0700

RESTRICT AUTOMERGE Protect against possible race conditions

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Test: Run the poc in b/38234812

Bug: 38234812
Change-Id: I28322e5a812c02c8e449ab8773715f60b9f5d976