OSDN Git Service

resolve merge conflicts of 2f1fd11c01 to master.
authorPavlin Radoslavov <pavlin@google.com>
Tue, 20 Oct 2015 17:22:23 +0000 (10:22 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Tue, 20 Oct 2015 17:22:23 +0000 (10:22 -0700)
commite498e7e75e02370861e9188c0fa5718ca8c8b2e4
tree2dedf0ed6acb03ff309eadca1a670c01f26ce338
parenta3797adf5ecfb3105d37b9da4eb3475752a827a8
parent2f1fd11c016b3093337b05c62c1d176434f67896
resolve merge conflicts of 2f1fd11c01 to master.

Change-Id: Ie4a92c10f123554af236b1a362363b558dbaa368