tree 4845583dff6348dfb7108c43af439aa39165ac1b
parent c2648132d2dc5874bb49de4efdf1d9a2e12eb6e8
parent 2857bd1e442d12e4afae6d5c6789d661e7ea53de
author Daniel Rosenberg <drosen@google.com> 1460496489 -0700
committer Daniel Rosenberg <drosen@google.com> 1460496489 -0700

resolve merge conflicts of 2857bd1 to nyc-dev

Change-Id: I3dc666cd44deb3e8438c2a482328f79e7a67e81e