OSDN Git Service

Merge "Invoke the aidl-cpp compiler to generate C++" am: ba39c5690a am: 487cc7beaf
authorChristopher Wiley <wiley@google.com>
Tue, 20 Oct 2015 20:14:50 +0000 (20:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 20:14:50 +0000 (20:14 +0000)
am: 9c694a6242

* commit '9c694a6242a969e27fbd4f043fa7f43ef301b461':
  Invoke the aidl-cpp compiler to generate C++

1  2 
core/config.mk
core/definitions.mk

diff --cc core/config.mk
Simple merge
Simple merge