OSDN Git Service

resolve merge conflicts of 00046ad to nyc-mr1-dev-plus-aosp
authorBadhri Jagan Sridharan <Badhri@google.com>
Tue, 28 Jun 2016 22:18:58 +0000 (15:18 -0700)
committerBadhri Jagan Sridharan <Badhri@google.com>
Tue, 28 Jun 2016 22:18:58 +0000 (15:18 -0700)
commit9898553d6211350bab8af4f7a85cab4bae2d2e82
tree99d9a1ea69223e883f420b3684e901d2d569b3ef
parent959e62c54f426ce8c59da205f0305e763859b66a
parent00046ad56ecd098594e921033bf9106e4e1d373b
resolve merge conflicts of 00046ad to nyc-mr1-dev-plus-aosp

Change-Id: I9540ecace4b20e8931fdf591e2d6604caf194f4c
core/Makefile