OSDN Git Service

resolved conflicts for merge of ecfc97f7 to mnc-dev
authorSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 23:06:34 +0000 (16:06 -0700)
committerSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 23:06:34 +0000 (16:06 -0700)
commit6d5ddc32abcea651afdfdd4c2f6435506007aede
tree8204e09e0bfaae0e490c7cc85f67c95c49bbb77f
parent4826dee78d1e5834aed73b40a11432e2ea5b85a9
parentecfc97f772bb1ab74c107258ba548024d12a62da
resolved conflicts for merge of ecfc97f7 to mnc-dev

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