Jason Monk 45c3597975 resolved conflicts for merge of 8e6b5343 to master ...

Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d

2014-08-18 11:05:17 -04:00

..

current.txt

resolved conflicts for merge of 8e6b5343 to master

2014-08-18 11:05:17 -04:00

removed.txt

Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)

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