Julia Reynolds 34b5930fc3 resolved conflicts for merge of 9ef71fb5 to master ...

Change-Id: I5b03835eddb1d0f5f3d93814732213458d5cd5d2

2014-08-15 20:26:42 -04:00

..

current.txt

resolved conflicts for merge of 9ef71fb5 to master

2014-08-15 20:26:42 -04:00

removed.txt

Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)

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