Jean-Baptiste Queru 17c61aaf46 resolved conflicts for merge of ecd4a4d0 to gingerbread-plus-aosp ...

Change-Id: I623544ad03ae1a750fac6b0f8a3427fc5590b5c9

2010-07-23 18:45:02 -07:00

..

.classpath

resolved conflicts for merge of ecd4a4d0 to gingerbread-plus-aosp

2010-07-23 18:45:02 -07:00

android-formatting.xml

Revise template to match spec per jham.

2009-10-01 22:14:45 -07:00

android.importorder

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00