Merge in fixes from Google repo
authorPyry Haulos <phaulos@google.com>
Thu, 21 Apr 2016 22:09:41 +0000 (15:09 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 21 Apr 2016 22:09:41 +0000 (15:09 -0700)
commit4a33f82c0c69347f3ca52da630ee830ff7392ca9
tree20b723a843f22f98e383aa4e6b96897f466d732b
parentfebb0bbd97bc3004df7e81f90e9a5ddb49504aac
parent14f617f74c651ca0b38ff13ecc52090e48cffe10
Merge in fixes from Google repo