OSDN Git Service

resolved conflicts for merge of 1a4b9939 to master
authorEric Laurent <elaurent@google.com>
Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)
committerEric Laurent <elaurent@google.com>
Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)
commite9e2f6f78a08060640b1bc38812d30f12bdd589c
tree197a1bd990333021bf7e1dcf4f030b521b902fce
parent3f194e6e3a62cbb846e8948eac8e4ce9aa7444a6
parent2ae141d964ea7e2f1cc9beceb6641ec779cad8ef
resolved conflicts for merge of 1a4b9939 to master

Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2