OSDN Git Service

resolve merge conflicts of 3a1776794a54 to master
authorAdrian Roos <roosa@google.com>
Wed, 5 Apr 2017 20:52:21 +0000 (13:52 -0700)
committerAdrian Roos <roosa@google.com>
Wed, 5 Apr 2017 20:52:27 +0000 (13:52 -0700)
commitb58ce251e3b2df398f6a0a4ba1c646fc987eee97
treeec4450b6ed57ffa96fad7b0c4b435704c89ff72b
parent17168b773f83f5c674205922a12733d407109bcd
parent3a1776794a5408747352e8acf867c99942e13708
resolve merge conflicts of 3a1776794a54 to master

Test: runtest systemui
Change-Id: I711fe627beb95c6e8a089a2118a842f951754abe