tree 532a805088681d716899a5506cdbe628d5f6bf29
parent 1f680de1a7a9558711cb4c5dd54d296a123ddda1
parent 7c8c5d6fb9bc3c4c216dd13646016c9550009069
author Aaron Holden <aaronholden@google.com> 1492024305 +0000
committer android-build-merger <android-build-merger@google.com> 1492024305 +0000

Merge "Merge "Make sure modules aren't marked done on retry-type custom" into nougat-cts-dev am: 6a8957d215" into nougat-mr1-cts-dev am: c46afb068c am: 79e1a1f2e5
am: 7c8c5d6fb9

Change-Id: Ia6de1dd98f791d0fd2f06abf00b3f933714b2075