Gilles Debunne 7499a1ca68 resolved conflicts for merge of 5d146549 to master ...

Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b

2010-10-10 16:50:28 -07:00

..

android

resolved conflicts for merge of 5d146549 to master

2010-10-10 16:50:28 -07:00

com

Fix alert dialog layout size in landscape

2010-10-08 17:04:39 -07:00

jarjar-rules.txt

…

overview.html

…