OSDN Git Service

resolve merge conflicts of 9d47cae to nyc-docs
authorsreevanis <sreevanis@google.com>
Wed, 3 Aug 2016 21:47:58 +0000 (14:47 -0700)
committersreevanis <sreevanis@google.com>
Wed, 3 Aug 2016 21:47:58 +0000 (14:47 -0700)
commitd5cabb92bcbeaaa309893f1ea9f12053afcbe6a3
tree3cccbb861480c641f1cf4e5fe8795976b5951e40
parent741757f27fe54c88c1c1314daa76d748660796d1
parent9d47caeae96d975417d69f1f74fb7a9b66e3d398
resolve merge conflicts of 9d47cae to nyc-docs

Change-Id: I737539c2bdaca60ac1dac3ca5ecb815c9bd440ab