tree e09fb516154832b583527f3def269f5cea41fef0
parent 7cc9d6763e6ffff1a945b802416e701b104ac42a
parent c36f61370cb12f75af4e80f181aba94370eec648
author Pawin Vongmasa <pawin@google.com> 1509410387 +0000
committer android-build-merger <android-build-merger@google.com> 1509410387 +0000

Merge "RESTRICT AUTOMERGE Protect against possible race conditions" into nyc-dev am: d1c3cd5c2a
am: c36f61370c

Change-Id: I20cfa13d71bfd4fbeea2c6c3b4975fc64f4c80d5