resolve merge conflicts of 9a6dd53 to master
authorPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 15:03:27 +0000 (08:03 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 15:03:27 +0000 (08:03 -0700)
commit895215ffe65f5ff1a572039e0cca7edb556753f3
tree46510b4073038d59f0793a4516bbea8627345edb
parent1a5fa200275ba4c288231265eca8cb2d25202283
parent9a6dd53af23e1f166d719b3a23521e4e21d5d0f3
resolve merge conflicts of 9a6dd53 to master

Change-Id: Idb8abdf776d6ece74a2fdfab3941678c9813eea0