OSDN Git Service

resolved conflicts for merge of 74af525e to master
authorWink Saville <wink@google.com>
Fri, 13 May 2011 21:01:16 +0000 (14:01 -0700)
committerWink Saville <wink@google.com>
Fri, 13 May 2011 21:01:16 +0000 (14:01 -0700)
commitc5db445534083adfe51967d39ab0178b26f35d08
tree7c3a0d82b39adcb5d87692084cd4df7dc4a73876
parent282cdfb6f4babbb63b7b9b4e9714ccb994ac56c2
parente7afca1967aff3fcaa6dbb06b1dfae7922514f84
resolved conflicts for merge of 74af525e to master

Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d