OSDN Git Service

resolved conflicts for edf3e911 to master
authorPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 22:02:01 +0000 (15:02 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 22:02:01 +0000 (15:02 -0700)
commit050e6a46a6e940795bd163c81bbb18843793df6a
tree2dedf0ed6acb03ff309eadca1a670c01f26ce338
parent0855496448b9466f0c69e634ccd73e1b10de134e
parentedf3e911e37737b47f5a46a20313ea1ce760062d
resolved conflicts for edf3e911 to master

Change-Id: Ie7030e681a6a92246aa772198c8c1130b5f1786c