OSDN Git Service

resolved conflicts for merge of 34706a4c to master
authorDianne Hackborn <hackbod@google.com>
Sat, 25 Feb 2012 00:37:35 +0000 (16:37 -0800)
committerDianne Hackborn <hackbod@google.com>
Sat, 25 Feb 2012 00:37:35 +0000 (16:37 -0800)
commit189752708cdd5d7bcba04cfbdae7794ceaabdb1f
treeceff349c4850df6c830d026aae4249b437b4c3ba
parentd020d613773391128bad29335ad1a955ed379b5a
parentde3f69a237ed8b058d75c8bb695a10737f9de125
resolved conflicts for merge of 34706a4c to master

Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8