tree 1473174be94e8209994a41ab389ee3dd2ece8003
parent a74e729fa991064dd6eba8c49924b2a88efdc463
parent b84954cf92dbedd7ef3c4cd6868cad9e5b637d7d
author Rubin Xu <rubinxu@google.com> 1453855418 +0000
committer Rubin Xu <rubinxu@google.com> 1453855418 +0000

resolve merge conflicts of b84954cf92 to master.

Change-Id: I8a5a1a989968c46ea4807db9e7e06b298244876d