OSDN Git Service

resolved conflicts for merge of 97903767 to gingerbread-plus-aosp
authorAndy Stadler <stadler@android.com>
Sat, 18 Sep 2010 02:16:26 +0000 (19:16 -0700)
committerAndy Stadler <stadler@android.com>
Sat, 18 Sep 2010 02:16:26 +0000 (19:16 -0700)
commit66ce420c325fe32a4da67f8a9a0914a093df2f42
treea7452915e9df2ea381f4b52f5cf65c45959ba71f
parent591b5edf255a5872fbfb5424f3ee0028fd036d08
parent97903767d36c597a4c7ee9979c15d36688134209
resolved conflicts for merge of 97903767 to gingerbread-plus-aosp

Change-Id: Ic71831342d8e7d548b3d082a97486b40e0636994
ide/eclipse/.classpath