diff options
| author | P.Y. Laligand <pylaligand@google.com> | 2015-05-12 17:39:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 17:39:57 +0000 |
| commit | e6c47686f62643d3399218eef4728c22358cbcfb (patch) | |
| tree | 7fc2b26868c6a5767d3c87e1a8e3f1cc2f309e22 /Android.mk | |
| parent | 4b403557bca7b622c187c3b06814e2118ec7d985 (diff) | |
| parent | b3b9eb3cfc5b3b3609a5d01258315798b38a5cf9 (diff) | |
| download | frameworks_base-e6c47686f62643d3399218eef4728c22358cbcfb.zip frameworks_base-e6c47686f62643d3399218eef4728c22358cbcfb.tar.gz frameworks_base-e6c47686f62643d3399218eef4728c22358cbcfb.tar.bz2 | |
Merge "DO NOT MERGE - Display mode switches." into mnc-dev
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -519,10 +519,11 @@ aidl_files := \ frameworks/base/core/java/android/net/Uri.aidl \ frameworks/base/core/java/android/net/NetworkRequest.aidl \ frameworks/base/core/java/android/net/LinkAddress.aidl \ - frameworks/base/core/java/android/view/Surface.aidl \ - frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \ + frameworks/base/core/java/android/view/Display.aidl \ frameworks/base/core/java/android/view/InputDevice.aidl \ frameworks/base/core/java/android/view/InputEvent.aidl \ + frameworks/base/core/java/android/view/Surface.aidl \ + frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \ frameworks/base/core/java/android/view/inputmethod/InputMethodSubtype.aidl \ frameworks/base/core/java/android/view/inputmethod/CursorAnchorInfo.aidl \ frameworks/base/core/java/android/view/inputmethod/CompletionInfo.aidl \ |