tree 9c0bbb76adb644a02c4699ee04c2e9b9730b71b2
parent 655abe4fcfae883b8bab91708e68e7d9ef7ee66a
parent be5c4e23911263e7c8fa56f85bebf7a96455bbd5
author Jeff Gaston <jeffrygaston@google.com> 1495068890 +0000
committer android-build-merger <android-build-merger@google.com> 1495068890 +0000

Merge "Revert "Disallow multiple build executions in parallel"" am: 43aecf67f4
am: be5c4e2391

Change-Id: I5a97ca5dc5e366dedbd768d20fb4852ad49917ae