tree 37652ed6cbe043c4602f4fb18161909dbdbece0e
parent 5952feb4fc1de040c159dec4212d22d4a03a1721
parent b0e6a700f2f0c67866a62d1a9f313e0578d58425
author Aart Bik <ajcbik@google.com> 1519686609 +0000
committer android-build-merger <android-build-merger@google.com> 1519686609 +0000

Merge "Wait for the right number of finalizations." am: fa76b40107
am: b0e6a700f2

Change-Id: I6fa891ae41592fdba559e333259fd874b2c56736