OSDN Git Service

resolve merge conflicts of 505f1ea to nyc-dev-plus-aosp
authorShinichiro Hamaji <hamaji@google.com>
Fri, 13 May 2016 05:33:09 +0000 (14:33 +0900)
committerShinichiro Hamaji <hamaji@google.com>
Fri, 13 May 2016 05:33:34 +0000 (14:33 +0900)
commit4ed2ff913b5656b2197147aed9ee94a4dde0d8c2
tree3ca603914d2d3394158bba30b1cd2658fecda905
parent2697421213c42e791affe2f2784774c2c4c09dc2
parent505f1eaaa9892423ec4fed256a755bcee3e3a988
resolve merge conflicts of 505f1ea to nyc-dev-plus-aosp

Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e
core/definitions.mk