OSDN Git Service

resolve merge conflicts of 9cbe37e to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Tue, 21 Jun 2016 20:35:26 +0000 (13:35 -0700)
committerTao Bao <tbao@google.com>
Tue, 21 Jun 2016 20:37:26 +0000 (13:37 -0700)
commit6047c24faea772eabe2eaad96087290f47720c75
tree8ff8ce2dc85c8be43647e1bd7125e33d735ca3c8
parent1a866dc2178c70f1eddc4047453b980b9f546fd8
parent9cbe37e723ca8845b8f9707571c6b75a18845431
resolve merge conflicts of 9cbe37e to nyc-mr1-dev-plus-aosp

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