OSDN Git Service

resolved conflicts for merge of 3170c035 to lmp-mr1-dev
authorJinsuk Kim <jinsukkim@google.com>
Fri, 10 Oct 2014 22:23:18 +0000 (07:23 +0900)
committerJinsuk Kim <jinsukkim@google.com>
Fri, 10 Oct 2014 22:23:18 +0000 (07:23 +0900)
commit62ba538b940ab0f69991fbc949bed513e0548d6e
treeadb36e428e245ebddce339293acf9865adc60bce
parente61e68d001ac858d87a7f639515f12c3eafcd297
parent3170c03543e4be7bb82194a84949d920ffe1b82e
resolved conflicts for merge of 3170c035 to lmp-mr1-dev

Change-Id: Ia34a304451f0dd7148d6d0cbd1d8c8ca81001b86
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java