Jean-Baptiste Queru bf133cf2dd am 401a65b7: resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp ...

* commit '401a65b7846fb87991142d9caa4a6176f75bbe27':
  Fix Eclipse classpath file for ICS.

2012-06-12 08:02:08 -07:00

..

eclipse

am 401a65b7: resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp

2012-06-12 08:02:08 -07:00

emacs

Merge change I9bdf6690

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

intellij

Up line width from 80 to 100.

2012-05-24 19:44:00 -07:00

xcode

auto import from //depot/cupcake/@135843

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