OSDN Git Service

resolve merge conflicts of 8ebbc4e to nyc-mr1-dev
authorMohamad Ayyash <mkayyash@google.com>
Thu, 16 Jun 2016 20:22:30 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 20:22:30 +0000 (20:22 +0000)
commit44dc2a973faec47aa96006e0e9010368373ab1a9
treeb43ffcf37cb5421e978981d44fb9d02743e1ba89
parent2d126ab2a49688bf61bd017fcfd2467ca455a729
parent423862500b60052f2866732e61578069b07c7ca3
resolve merge conflicts of 8ebbc4e to nyc-mr1-dev
am: 423862500b

Change-Id: I8f8dd48e52c1ab7cb3462725569cf7c1e0443d38
core/Makefile
tools/releasetools/build_image.py