Merge "fix a race condition caused by intra function pointer initialization"
authorYunqing Wang <yunqingwang@google.com>
Tue, 3 Mar 2015 23:47:06 +0000 (15:47 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 3 Mar 2015 23:47:06 +0000 (15:47 -0800)

Trivial merge