Kenny Guy 6699748d68 resolved conflicts for merge of 06cc91a6 to master ...

Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73

2014-08-21 14:34:37 +01:00

..

current.txt

resolved conflicts for merge of 06cc91a6 to master

2014-08-21 14:34:37 +01:00

removed.txt

Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)

2014-07-29 14:43:03 +02:00