OSDN Git Service

resolved conflicts for a1fcaf86 to mnc-dr-dev
authorIan Pedowitz <ijpedowitz@google.com>
Wed, 16 Sep 2015 01:39:19 +0000 (18:39 -0700)
committerIan Pedowitz <ijpedowitz@google.com>
Wed, 16 Sep 2015 01:39:19 +0000 (18:39 -0700)
commita0abf49d2bdc42c81e5f636e54da9038de9dfc21
tree8c53917a7dba5ad6d0f7d8429e88d809c67ec732
parent07e0af0d1876964d2f79da78a1f88b90adc43331
parenta1fcaf86c43c6d85d0ed94e3ac483f2c8a7426a8
resolved conflicts for a1fcaf86 to mnc-dr-dev

Change-Id: Ie53652faa530a3c9c83f30c8f2b636d90f0f1b7a
tools/releasetools/ota_from_target_files.py