OSDN Git Service

resolve merge conflicts of c36ab42 to nyc-mr1-dev-plus-aosp
authorDavid Zeuthen <zeuthen@google.com>
Thu, 29 Sep 2016 18:24:30 +0000 (14:24 -0400)
committerDavid Zeuthen <zeuthen@google.com>
Thu, 29 Sep 2016 18:25:03 +0000 (14:25 -0400)
commit27ac0e34fec282656853e5a1be34a20fbe36e3b6
treef2ad771d16b6daf1f15f5c851efe654b641dbf13
parentdc7706a8ad4988c183f061a590254a584800dd71
parentc36ab42dccad8de3903367ebed4e9dcf7f6ce99d
resolve merge conflicts of c36ab42 to nyc-mr1-dev-plus-aosp

Change-Id: Iaf78fb6c723955fd92cc64194cb32bba73a9dafb
core/Makefile
core/main.mk
tools/releasetools/add_img_to_target_files.py
tools/releasetools/common.py