diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-01-14 13:51:45 -0800 |
|---|---|---|
| committer | Chad Brubaker <cbrubaker@google.com> | 2015-01-14 13:51:45 -0800 |
| commit | 29f4d9f9ea58c19c3c9ea624a0c88643eb48866d (patch) | |
| tree | 39a2a9503af1a947655a0fd6adb3ad87c8091499 /Android.mk | |
| parent | c626773562716168ce710320ce1e36d99fd6664a (diff) | |
| parent | 3d64a8508aedaaeb2f8322762b0dcade0b33d2f5 (diff) | |
| download | frameworks_base-29f4d9f9ea58c19c3c9ea624a0c88643eb48866d.zip frameworks_base-29f4d9f9ea58c19c3c9ea624a0c88643eb48866d.tar.gz frameworks_base-29f4d9f9ea58c19c3c9ea624a0c88643eb48866d.tar.bz2 | |
resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp
Change-Id: Ieed2c2a3b9977c30bc5318317c91c29907aa1377
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -205,6 +205,7 @@ LOCAL_SRC_FILES += \ core/java/android/os/IUpdateLock.aidl \ core/java/android/os/IUserManager.aidl \ core/java/android/os/IVibratorService.aidl \ + core/java/android/security/IKeystoreService.aidl \ core/java/android/service/carrier/ICarrierMessagingCallback.aidl \ core/java/android/service/carrier/ICarrierMessagingService.aidl \ core/java/android/service/notification/INotificationListener.aidl \ |