diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-07 12:50:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-07 12:50:07 +0000 |
| commit | 9bc6acf27ac446b7e18a51a926caafd99cf34713 (patch) | |
| tree | 1c84566cb6974d644a0771efadc085a74329ab0b /media/java | |
| parent | 670327544184dbd6274de9127ceaf20dfd5801b4 (diff) | |
| parent | 44ba5c1b4ef33ff50dacb2eb5553d01405e77f4d (diff) | |
| download | frameworks_base-9bc6acf27ac446b7e18a51a926caafd99cf34713.zip frameworks_base-9bc6acf27ac446b7e18a51a926caafd99cf34713.tar.gz frameworks_base-9bc6acf27ac446b7e18a51a926caafd99cf34713.tar.bz2 | |
Merge "AArch64: Use long for pointers in VideoEditor classes"
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/videoeditor/MediaArtistNativeHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java index f4fccbe..2b0b3e2 100644 --- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java +++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java @@ -118,7 +118,7 @@ class MediaArtistNativeHelper { private boolean mErrorFlagSet = false; @SuppressWarnings("unused") - private int mManualEditContext; + private long mManualEditContext; /* Listeners */ |