OSDN Git Service

resolve merge conflicts of 70adfe3 to nyc-dev
authorKevin Hufnagle <khufnagle@google.com>
Wed, 27 Apr 2016 05:14:38 +0000 (22:14 -0700)
committerKevin Hufnagle <khufnagle@google.com>
Wed, 27 Apr 2016 05:14:38 +0000 (22:14 -0700)
commit8ce7d79c64f697df14238b70603ce49ddeb2e105
treecf19e46ba6a753735cb9ebf7c4e2969ead51cca6
parent6373dc7260bf2769783084d7d85b3438e8a893db
parent70adfe39aee0f901824886cdb13a79022df4f6bb
resolve merge conflicts of 70adfe3 to nyc-dev

Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f