OSDN Git Service

resolved conflicts for merge of 5a374f94 to master
authorFred Quintana <fredq@google.com>
Tue, 15 Dec 2009 23:57:33 +0000 (15:57 -0800)
committerFred Quintana <fredq@google.com>
Tue, 15 Dec 2009 23:57:33 +0000 (15:57 -0800)
commit2c5634198a4438e0d6be3e8cc3ae5fc6b0fdf588
tree06ec42e1a77f438bad81867cf22200d59d582471
parentc333133107fb492de481a96ed1277e71daf2dd8c
parent5a374f94f8be9604e0485e07943637783522c0b7
resolved conflicts for merge of 5a374f94 to master
api/current.xml
preloaded-classes