OSDN Git Service

resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp
authorAlex Light <allight@google.com>
Wed, 29 Jun 2016 22:43:45 +0000 (15:43 -0700)
committerAlex Light <allight@google.com>
Wed, 29 Jun 2016 22:43:54 +0000 (15:43 -0700)
commita3e8e9c6f33ecd57221b7fe0ab1bf9c5035351ed
tree1355e96d51267c03f9157da55fdd9ecf138a8a48
parent84341566343c68cbffe5aa27115b242c7a3059f1
parent3f7c34859e484be7ec710837fbdb9563c3f8d328
resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp

Bug: 29278988

Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d
core/Makefile
core/cleanbuild.mk
core/dex_preopt.mk
core/dex_preopt_libart.mk
core/dex_preopt_odex_install.mk
core/envsetup.mk
core/main.mk
tools/releasetools/add_img_to_target_files.py
tools/releasetools/build_image.py