OSDN Git Service

resolved conflicts for merge of 62d005ec to master
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Sep 2010 06:06:27 +0000 (23:06 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 10 Sep 2010 06:06:27 +0000 (23:06 -0700)
commit98805c8f6d11d3c8c357abdae1ba13529889b84e
tree89ff8514ad6e7ca57179caa363df5a98f06c17c0
parent903c235897d94ecb17fb9b45b377d7c84c6bb1c4
parent87005bc57fcea4d5cb3cabe345127d21d339bef4
resolved conflicts for merge of 62d005ec to master

Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd