OSDN Git Service

resolved conflicts for merge of c608e106 to master
authorJeff Brown <jeffbrown@google.com>
Sun, 30 Jan 2011 20:50:09 +0000 (12:50 -0800)
committerJeff Brown <jeffbrown@google.com>
Sun, 30 Jan 2011 20:50:09 +0000 (12:50 -0800)
commitb7b1583a2d0911a031fa5bdc93ecb7633bdbc7ef
treeeac00f6824e5e468db96357eadd8c26a92b9ed7b
parent03aa43c25c6c35c05995f20318e420a9dc15053f
parentf5f7359e8ba5ccde2ee3feff953d486eabd8c7d1
resolved conflicts for merge of c608e106 to master

Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8