OSDN Git Service

resolved conflicts for merge of fb729202 to master
authorGilles Debunne <debunne@google.com>
Tue, 6 Dec 2011 23:57:47 +0000 (15:57 -0800)
committerGilles Debunne <debunne@google.com>
Tue, 6 Dec 2011 23:57:47 +0000 (15:57 -0800)
commiteaa88702306d04d2f129376734b33f47e7e0388c
treea4f7155e7d0e10895947a985fd9e447a72f9a5a0
parent7f5b06e44040667b27f6499fba08a848a55d7921
parent520e598f560a4ae2abc517da85919ad744d1071f
resolved conflicts for merge of fb729202 to master

Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0