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

..

eclipse

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

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

emacs

Merge change I9bdf6690

2009-11-13 15:31:49 -08:00

intellij

auto import from //depot/cupcake/@135843

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

xcode

auto import from //depot/cupcake/@135843

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