OSDN Git Service

resolve merge conflicts of 40afdf05b5ba to master
authorKang Li <kanlig@google.com>
Wed, 12 Apr 2017 20:27:14 +0000 (13:27 -0700)
committerKang Li <kanlig@google.com>
Wed, 12 Apr 2017 20:36:07 +0000 (20:36 +0000)
commit4762931cf73a774e4618fd3015c311b6cc0db16c
tree552ac55601dc5f246ffbd929aa76f7387a5dc91b
parent43791354c72dec37f9e93ab9cb1b494bb99926db
parent40afdf05b5baf561adb495e881670e7dfd1120bc
resolve merge conflicts of 40afdf05b5ba to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic31b6858fb0850b36bb6751c6bd5ef18675ee277