OSDN Git Service

Merge commit 'a66c512'
authorMike Lockwood <lockwood@google.com>
Thu, 22 Mar 2012 00:08:00 +0000 (17:08 -0700)
committerMike Lockwood <lockwood@google.com>
Thu, 22 Mar 2012 00:08:07 +0000 (17:08 -0700)
commitbd570f71257fe9ea47814cb3b594eca467d3f98d
treef9291bc63cf4b9d93d24b880a22dd4458fd0e2d5
parente8eb8df9896e7d3a78047f0922a90b0cd3c2aedc
parenta66c5122082a8e22aa34a33c6e9e86c3d3dc8355
Merge commit 'a66c512'

empty -s ours merge

Change-Id: Id71a9514bdf0a8ca9c4c5ab847387b8ea544d0ab