tree 4561543c773573238276cb82cba1140114cfb01b
parent a624892dd1c2ead2d9e64407a2d052701c69b974
parent 45bcfaf7a1b208ad21c8ba0c9cc8a75c6feeb6f6
author sachiyo <sachiyo@google.com> 1516669121 -0800
committer Sachiyo Sugimoto <sachiyo@google.com> 1516743070 +0000

resolve merge conflicts of 45bcfaf7a1b208ad21c8ba0c9cc8a75c6feeb6f6 to master

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