OSDN Git Service

resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:43:45 +0000 (11:43 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:43:45 +0000 (11:43 -0700)
commitc0e9c66d7d59873443714cc19e5cea8c044931bb
tree164d3fdc2fa10acd8dac0fc46956aad712ab07cc
parent7d5299c28618b10c00c7e452d34d9b2485e478fe
parent8e015b7ba46b18a4a0741be7d64f389433c79230
resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev