| commit | ece795c3091f5e3de3f4ff39f3dd632afc201050 | [log] [tgz] |
|---|---|---|
| author | Shri Borde <shri@google.com> | Wed Aug 26 03:47:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 03:47:37 2015 +0000 |
| tree | bebad1e6cb63cae53b6e9a0ec554d6a7412d96e2 | |
| parent | 95903a86bf827a09d9bc7780a6e3b882745bd201 [diff] | |
| parent | 3a0ddc3d801f9e44960e9abe98bcaa9f8d78961d [diff] |
am 3a0ddc3d: am eba0949b: Access incoming audio files after user taps Play * commit '3a0ddc3d801f9e44960e9abe98bcaa9f8d78961d':
diff --git a/jni/GifTranscoder.cpp b/jni/GifTranscoder.cpp index 44fa30c..1f329f7 100644 --- a/jni/GifTranscoder.cpp +++ b/jni/GifTranscoder.cpp
@@ -498,11 +498,11 @@ GifFilesCloser::~GifFilesCloser() { if (mGifIn) { - DGifCloseFile(mGifIn); + DGifCloseFile(mGifIn, NULL); mGifIn = NULL; } if (mGifOut) { - EGifCloseFile(mGifOut); + EGifCloseFile(mGifOut, NULL); mGifOut = NULL; } }
diff --git a/res/drawable-hdpi/ic_checkbox_light.png b/res/drawable-hdpi/ic_checkbox_light.png index 7aa9f5f..e41ba42 100644 --- a/res/drawable-hdpi/ic_checkbox_light.png +++ b/res/drawable-hdpi/ic_checkbox_light.png Binary files differ
diff --git a/res/drawable-hdpi/ic_checkmark_circle_blue.png b/res/drawable-hdpi/ic_checkmark_circle_blue.png index 55f277e..7932c30 100644 --- a/res/drawable-hdpi/ic_checkmark_circle_blue.png +++ b/res/drawable-hdpi/ic_checkmark_circle_blue.png Binary files differ
diff --git a/res/drawable-hdpi/ic_checkmark_small_blue.png b/res/drawable-hdpi/ic_checkmark_small_blue.png index 8661489..d84fd20 100644 --- a/res/drawable-hdpi/ic_checkmark_small_blue.png +++ b/res/drawable-hdpi/ic_checkmark_small_blue.png Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png index 2c52f06..5e4e62f 100644 --- a/res/drawable-hdpi/ic_launcher.png +++ b/res/drawable-hdpi/ic_launcher.png Binary files differ
diff --git a/res/drawable-hdpi/ic_person_add_blue.png b/res/drawable-hdpi/ic_person_add_blue.png index dfd2bc1..b7b85bd 100644 --- a/res/drawable-hdpi/ic_person_add_blue.png +++ b/res/drawable-hdpi/ic_person_add_blue.png Binary files differ
diff --git a/res/drawable-hdpi/ic_remove_light.png b/res/drawable-hdpi/ic_remove_light.png index 3992231..2222274 100644 --- a/res/drawable-hdpi/ic_remove_light.png +++ b/res/drawable-hdpi/ic_remove_light.png Binary files differ
diff --git a/res/drawable-mdpi/ic_checkbox_light.png b/res/drawable-mdpi/ic_checkbox_light.png index 3762dc4..b1b1269 100644 --- a/res/drawable-mdpi/ic_checkbox_light.png +++ b/res/drawable-mdpi/ic_checkbox_light.png Binary files differ
diff --git a/res/drawable-mdpi/ic_checkmark_circle_blue.png b/res/drawable-mdpi/ic_checkmark_circle_blue.png index 85735be..6cf348e 100644 --- a/res/drawable-mdpi/ic_checkmark_circle_blue.png +++ b/res/drawable-mdpi/ic_checkmark_circle_blue.png Binary files differ
diff --git a/res/drawable-mdpi/ic_checkmark_small_blue.png b/res/drawable-mdpi/ic_checkmark_small_blue.png index ec9dcb1..df6ea14 100644 --- a/res/drawable-mdpi/ic_checkmark_small_blue.png +++ b/res/drawable-mdpi/ic_checkmark_small_blue.png Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png index a6d2f55..ef6a3c5 100644 --- a/res/drawable-mdpi/ic_launcher.png +++ b/res/drawable-mdpi/ic_launcher.png Binary files differ
diff --git a/res/drawable-mdpi/ic_person_add_blue.png b/res/drawable-mdpi/ic_person_add_blue.png index 29f9066..0f63871 100644 --- a/res/drawable-mdpi/ic_person_add_blue.png +++ b/res/drawable-mdpi/ic_person_add_blue.png Binary files differ
diff --git a/res/drawable-mdpi/ic_remove_light.png b/res/drawable-mdpi/ic_remove_light.png index 0464885..5b1712a 100644 --- a/res/drawable-mdpi/ic_remove_light.png +++ b/res/drawable-mdpi/ic_remove_light.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_checkbox_light.png b/res/drawable-xhdpi/ic_checkbox_light.png index 9cb2b7e..a388a2b 100644 --- a/res/drawable-xhdpi/ic_checkbox_light.png +++ b/res/drawable-xhdpi/ic_checkbox_light.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_checkmark_circle_blue.png b/res/drawable-xhdpi/ic_checkmark_circle_blue.png index 211a405..ae0ac2d 100644 --- a/res/drawable-xhdpi/ic_checkmark_circle_blue.png +++ b/res/drawable-xhdpi/ic_checkmark_circle_blue.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_checkmark_small_blue.png b/res/drawable-xhdpi/ic_checkmark_small_blue.png index 9fc4a4b..d6354df 100644 --- a/res/drawable-xhdpi/ic_checkmark_small_blue.png +++ b/res/drawable-xhdpi/ic_checkmark_small_blue.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png index 3c82a06..ad1acb4 100644 --- a/res/drawable-xhdpi/ic_launcher.png +++ b/res/drawable-xhdpi/ic_launcher.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_person_add_blue.png b/res/drawable-xhdpi/ic_person_add_blue.png index 4e76e64..0cdaeee 100644 --- a/res/drawable-xhdpi/ic_person_add_blue.png +++ b/res/drawable-xhdpi/ic_person_add_blue.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_remove_light.png b/res/drawable-xhdpi/ic_remove_light.png index cbaf6d0..9424e1e 100644 --- a/res/drawable-xhdpi/ic_remove_light.png +++ b/res/drawable-xhdpi/ic_remove_light.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_checkbox_light.png b/res/drawable-xxhdpi/ic_checkbox_light.png index 3a1896b..b10c8e9 100644 --- a/res/drawable-xxhdpi/ic_checkbox_light.png +++ b/res/drawable-xxhdpi/ic_checkbox_light.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_checkmark_circle_blue.png b/res/drawable-xxhdpi/ic_checkmark_circle_blue.png index bede5b9..d40bb93 100644 --- a/res/drawable-xxhdpi/ic_checkmark_circle_blue.png +++ b/res/drawable-xxhdpi/ic_checkmark_circle_blue.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_checkmark_small_blue.png b/res/drawable-xxhdpi/ic_checkmark_small_blue.png index 65d3e5c..154c66e 100644 --- a/res/drawable-xxhdpi/ic_checkmark_small_blue.png +++ b/res/drawable-xxhdpi/ic_checkmark_small_blue.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png index 0d61198..de56e98 100644 --- a/res/drawable-xxhdpi/ic_launcher.png +++ b/res/drawable-xxhdpi/ic_launcher.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_person_add_blue.png b/res/drawable-xxhdpi/ic_person_add_blue.png index 10aa345..d9b6a77 100644 --- a/res/drawable-xxhdpi/ic_person_add_blue.png +++ b/res/drawable-xxhdpi/ic_person_add_blue.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_remove_light.png b/res/drawable-xxhdpi/ic_remove_light.png index 25bcc74..6f07cc5 100644 --- a/res/drawable-xxhdpi/ic_remove_light.png +++ b/res/drawable-xxhdpi/ic_remove_light.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_checkbox_light.png b/res/drawable-xxxhdpi/ic_checkbox_light.png index c8e8b79..f4c0cfc 100644 --- a/res/drawable-xxxhdpi/ic_checkbox_light.png +++ b/res/drawable-xxxhdpi/ic_checkbox_light.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_checkmark_circle_blue.png b/res/drawable-xxxhdpi/ic_checkmark_circle_blue.png index 7bb1501..0c2a7d5 100644 --- a/res/drawable-xxxhdpi/ic_checkmark_circle_blue.png +++ b/res/drawable-xxxhdpi/ic_checkmark_circle_blue.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_checkmark_small_blue.png b/res/drawable-xxxhdpi/ic_checkmark_small_blue.png index 3199069..855cfc5 100644 --- a/res/drawable-xxxhdpi/ic_checkmark_small_blue.png +++ b/res/drawable-xxxhdpi/ic_checkmark_small_blue.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/drawable-xxxhdpi/ic_launcher.png index 0d61198..9ac88b4 100644 --- a/res/drawable-xxxhdpi/ic_launcher.png +++ b/res/drawable-xxxhdpi/ic_launcher.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_person_add_blue.png b/res/drawable-xxxhdpi/ic_person_add_blue.png index b358660..13eb372 100644 --- a/res/drawable-xxxhdpi/ic_person_add_blue.png +++ b/res/drawable-xxxhdpi/ic_person_add_blue.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_remove_light.png b/res/drawable-xxxhdpi/ic_remove_light.png index b9288bf..e32a4dc 100644 --- a/res/drawable-xxxhdpi/ic_remove_light.png +++ b/res/drawable-xxxhdpi/ic_remove_light.png Binary files differ
