tree 2c5731443d332884768ab11aed8042399f216669
parent 75ad8a5b21e21a8750e7535bc6eae5dd22fdb1cd
parent 9355bce0c323632b88620ede174bf023b7381c81
author Hugo Benichi <hugobenichi@google.com> 1487294055 +0900
committer Hugo Benichi <hugobenichi@google.com> 1487296078 +0900

resolve merge conflicts of 9355bce0c323 to master

Test: none
Change-Id: Iac65e01d07edf79ec97e7d996f8cfee6f811606b