OSDN Git Service

resolved conflicts for merge of a7f68230 to master
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 23:06:25 +0000 (16:06 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 23:06:25 +0000 (16:06 -0700)
commit8166de603707f09eef33d0c2019f816aa657e717
tree4bf0bbd4c63e36ac154f4d124d82218b2aedfe0a
parent7b63107ff26676f937d98e32e45d6734bdc170ed
parent476ceb890ad6c2aa25f644b2346fdf6c36e81867
resolved conflicts for merge of a7f68230 to master

Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9