OSDN Git Service

resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev
authorMohamad Ayyash <mkayyash@google.com>
Wed, 24 Jun 2015 22:04:38 +0000 (15:04 -0700)
committerMohamad Ayyash <mkayyash@google.com>
Wed, 24 Jun 2015 22:04:38 +0000 (15:04 -0700)
commit9ca7fa8993bceb97a6256b60742eeda2f699560b
tree3b3594e5075263fe480e2a22ceb81642072c331e
parentf35ed6bd8497633c057030e5442cd0fc29b37b6c
parent1b748051dd160fbf16ea5875583c309f0790594d
resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev
tools/releasetools/common.py