diff options
| author | RoboErik <epastern@google.com> | 2014-09-05 14:29:31 -0700 |
|---|---|---|
| committer | RoboErik <epastern@google.com> | 2014-09-05 14:29:31 -0700 |
| commit | b59eacf5feee682483f681d26ebde0fc4811fa0f (patch) | |
| tree | ad7529cf18182346ccb8259ff452be8e02aad321 /Android.mk | |
| parent | 7d0db3c3640584c2270ea8cc27704a7044fc52b6 (diff) | |
| parent | 7ba09b1bb4bd302284b42e90ebad01bd3ec090d9 (diff) | |
| download | frameworks_base-b59eacf5feee682483f681d26ebde0fc4811fa0f.zip frameworks_base-b59eacf5feee682483f681d26ebde0fc4811fa0f.tar.gz frameworks_base-b59eacf5feee682483f681d26ebde0fc4811fa0f.tar.bz2 | |
resolved conflicts for merge of a41f48f8 to master
Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -496,8 +496,11 @@ aidl_files := \ frameworks/base/location/java/android/location/FusedBatchOptions.aidl \ frameworks/base/location/java/com/android/internal/location/ProviderProperties.aidl \ frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \ + frameworks/base/media/java/android/media/AudioAttributes.aidl \ + frameworks/base/media/java/android/media/MediaDescription.aidl \ frameworks/base/media/java/android/media/MediaMetadata.aidl \ frameworks/base/media/java/android/media/Rating.aidl \ + frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \ frameworks/base/media/java/android/media/routing/MediaRouteSelector.aidl \ frameworks/base/media/java/android/media/session/MediaSession.aidl \ frameworks/base/media/java/android/media/session/PlaybackState.aidl \ |