tree bfaff1834e5e04499aeb681468cefbd0a18e9e66
parent 5d89ccadb531c5bb4d651559156543a07034092f
parent d2e8ae4a907a9c8cbb49432f329a2b69fd941495
author Fyodor Kupolov <fkupolov@google.com> 1467216438 +0000
committer android-build-merger <android-build-merger@google.com> 1467216438 +0000

Merge \"Fixed race condition by using a separate counter\" into nyc-mr1-dev
am: d2e8ae4a90

Change-Id: I8774a4736c29cc8c0433776db40135ceb86ac8f8