Narayan Kamath dfd1aa4331 resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp ...

Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2

2014-01-31 12:57:24 +00:00

..

internal

resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp

2014-01-31 12:57:24 +00:00

server

Refactor display manager service to new pattern.

2014-01-16 22:16:42 -08:00