tree 12d14b2102fe94de78b5640aa341b764b67f01f4
parent 4ef9d41066d8b4124c2c59752512adf24102634d
parent 40b300fd80708fd100d22f22ff6100db20ee467f
author Jeff Sharkey <jsharkey@android.com> 1449161914 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1449161914 +0000

Merge "Fix race condition when collecting op callback."