OSDN Git Service

resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev
authorSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 22:42:27 +0000 (15:42 -0700)
committerSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 22:42:27 +0000 (15:42 -0700)
commitecfc97f772bb1ab74c107258ba548024d12a62da
tree9aab9b8f9461ed7fc64eeed2ac4bb825aed74687
parent9ca7fa8993bceb97a6256b60742eeda2f699560b
parentf86e7eeabc9721034d2c4af3b2827d93c2d23f6b
resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev

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