OSDN Git Service

resolved conflicts for merge of ecd4a4d0 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Sat, 24 Jul 2010 01:45:02 +0000 (18:45 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 24 Jul 2010 01:45:02 +0000 (18:45 -0700)
commit17c61aaf4607f89e512d883c210cfcc0dc042f4f
tree0012f40e683d43cbcac95d03d49b3a201a018231
parent474fe56acccc1372d1b21a7dbf74309005d699c6
parentecd4a4d09c71ba5c066929aee49e24cafa9fdad7
resolved conflicts for merge of ecd4a4d0 to gingerbread-plus-aosp

Change-Id: I623544ad03ae1a750fac6b0f8a3427fc5590b5c9
ide/eclipse/.classpath