diff options
| author | Tom Taylor <tomtaylor@google.com> | 2016-12-07 02:53:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 02:53:54 +0000 |
| commit | 838049884f892ca7fe9f76ddce503cd388e6898d (patch) | |
| tree | 7691c59f08159384908a2e20ff99a2fe8b31499b /jni/GifTranscoder.cpp | |
| parent | 49b092f60228f1282cfc2c75d46cd0c2ae7cd63e (diff) | |
| parent | 47feeee8ee0c4c85e5ea38950e3f7f70987b4b20 (diff) | |
| download | android_packages_apps_Messaging-838049884f892ca7fe9f76ddce503cd388e6898d.tar.gz android_packages_apps_Messaging-838049884f892ca7fe9f76ddce503cd388e6898d.tar.bz2 android_packages_apps_Messaging-838049884f892ca7fe9f76ddce503cd388e6898d.zip | |
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777
am: 47feeee8ee
Change-Id: Iec5af613a115c5120bbfd3e99d6e3503d0a05b36
Diffstat (limited to 'jni/GifTranscoder.cpp')
0 files changed, 0 insertions, 0 deletions