OSDN Git Service

resolved conflicts for merge of 20d06540 to master
authorScott Main <smain@google.com>
Tue, 31 Jan 2012 16:53:16 +0000 (08:53 -0800)
committerScott Main <smain@google.com>
Tue, 31 Jan 2012 16:55:23 +0000 (08:55 -0800)
commit4630cb780421abe2176484504fd2d871ef93cf3e
treea7bc38328dfbcdfc5221a2334b28be7cfe70cebb
parent105713549f95738ffdc43631cea80929f23e16d0
parent38a89182b5210ba1bc7d306387d70ed1ed25a589
resolved conflicts for merge of 20d06540 to master

Change-Id: I80da9a11b4538c070b0000cfa3ea6cd865e46aef