OSDN Git Service

resolved conflicts for merge of 583b7b16 to master
authorNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 19:37:23 +0000 (19:37 +0000)
committerNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 19:37:23 +0000 (19:37 +0000)
commitde22998fdd0a78400c5b8e6fc3609744e90b09c9
tree66688889ad519fb56fff65ac47a966ca9b5e6aba
parente0d1e295f15a5c70ca030732fd9309f0dc50b2cc
parent583b7b16718b2787e64f1f26e476d349b96a909a
resolved conflicts for merge of 583b7b16 to master

merged with "-s ours" since this change has already
been cherry-picked to master.