OSDN Git Service

resolve merge conflicts of 177c610e7f to cw-e-dev
authorTao Bao <tbao@google.com>
Tue, 8 Mar 2016 05:24:40 +0000 (21:24 -0800)
committerTao Bao <tbao@google.com>
Tue, 8 Mar 2016 05:24:40 +0000 (21:24 -0800)
commitbd25fcdc02a94ec9f50fc431a3731484b9812e23
tree0822de0174f8ed07057cc8916851dfd624594439
parentdf4cb0b2c1e6d1cf5973e9008bd6dc15bd590ac0
parent177c610e7ffcbfe4dc0e178feb9d235f1f4be047
resolve merge conflicts of 177c610e7f to cw-e-dev

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