Merge in fixes from Google repository
authorPyry Haulos <phaulos@google.com>
Fri, 22 Apr 2016 21:31:20 +0000 (14:31 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Apr 2016 21:31:20 +0000 (14:31 -0700)
commit2ecbcf6768157202488d2acd46a090282b9ccfaa
tree04714216186b92202d0cba3e3a8d64551a97827b
parent4a33f82c0c69347f3ca52da630ee830ff7392ca9
parent13a491c192e3adf617ec3ed5f1822ce1d79ebbc1
Merge in fixes from Google repository