OSDN Git Service

resolved conflicts for merge of 6cb3732d to master
authorDmitriy Ivanov <dimitry@google.com>
Mon, 20 Apr 2015 21:08:43 +0000 (14:08 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Mon, 20 Apr 2015 21:08:43 +0000 (14:08 -0700)
commit594c0868d42b11e21d77dbdafa571d582b99305a
tree046a1f2ecba2bd2f80cf3cf2bb51d12747c26d17
parent12753112f3e67c667c97078971d3538ef4fcdda7
parent6cb3732d82e6a2346c00219931d0f0a3c3257f44
resolved conflicts for merge of 6cb3732d to master

Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
core/clear_vars.mk
core/config.mk
core/product.mk