OSDN Git Service

resolve merge conflicts of f7388e6 to nyc-dev
authorPavlin Radoslavov <pavlin@google.com>
Fri, 29 Apr 2016 22:12:33 +0000 (15:12 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Fri, 29 Apr 2016 22:12:33 +0000 (15:12 -0700)
commit4ec6f7603acaf453a1f280e2fad1a1d0e35dbfa5
treeaa1912164be7e4003117ae02a4c8e778419d013f
parentb75ec300d2e7e0725eddb0e43d99ac85fc7197c4
parentf7388e685e5064e45ae5ee65ed6b6419cdef929c
resolve merge conflicts of f7388e6 to nyc-dev

Change-Id: I149778411a50fc5881b84cec01a2a4b43cbd2b5c