Tadashi G. Takaoka f48637a5b2 resolved conflicts for merge of 0325360d to master ... Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755		2010-09-29 13:51:06 +09:00
..
bools.xml	add new preference for popup preview	2010-08-12 16:45:44 +09:00
dimens.xml	resolved conflicts for merge of 0325360d to master	2010-09-29 13:51:06 +09:00