diff options
| author | Colin Cross <ccross@android.com> | 2014-03-21 13:23:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 13:23:05 -0700 |
| commit | 6418a7d30c38641bc0b1e471ff50624b86a0052a (patch) | |
| tree | a763f760325bb1c6b79cd4d9a350502cf37a24ab /Android.mk | |
| parent | 4474da7c740443a280da2a02e811d964d336e367 (diff) | |
| parent | 8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2 (diff) | |
| download | frameworks_base-6418a7d30c38641bc0b1e471ff50624b86a0052a.zip frameworks_base-6418a7d30c38641bc0b1e471ff50624b86a0052a.tar.gz frameworks_base-6418a7d30c38641bc0b1e471ff50624b86a0052a.tar.bz2 | |
am 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master"
* commit '8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
Add HDMI-CEC service
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -136,6 +136,8 @@ LOCAL_SRC_FILES += \ core/java/android/hardware/ISerialManager.aidl \ core/java/android/hardware/display/IDisplayManager.aidl \ core/java/android/hardware/display/IDisplayManagerCallback.aidl \ + core/java/android/hardware/hdmi/IHdmiCecListener.aidl \ + core/java/android/hardware/hdmi/IHdmiCecService.aidl \ core/java/android/hardware/input/IInputManager.aidl \ core/java/android/hardware/input/IInputDevicesChangedListener.aidl \ core/java/android/hardware/location/IFusedLocationHardware.aidl \ |