OSDN Git Service

resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Fri, 24 Jun 2016 02:48:40 +0000 (19:48 -0700)
committerTao Bao <tbao@google.com>
Fri, 24 Jun 2016 02:48:40 +0000 (19:48 -0700)
commitb79e31756b979462294632f1a1e61ce52b833206
tree3403cb9ea5457e594d3372d9407105eaadc3e4c3
parentd35dcb9092f502561a72b1c55d3e028f59928cb2
parent2abbbd03339947327ada0becba5bd4ef41f1bdab
resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp

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