aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-15am ce1d390f: keep history after reset to ub-camera-haleakalaandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Alex Cheung
* commit 'ce1d390fbf0d4cad74dacdc55c0f6b1f98ae5cb1':
2015-05-15keep history after reset to ub-camera-haleakalaAlex Cheung
2015-05-15keep history after reset to ub-camera-haleakalaandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devAlex Cheung
2015-05-15am b4b82b7e: am ac008b79: keep history after reset to ub-camera-haleakalaAlex Cheung
* commit 'b4b82b7eca1c854469ff2e0e666f7418d946d4b0':
2015-05-15am d9f89c5d: Merge branch \'mnc-ub-dev\' of ↵Chris Banes
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev * commit 'd9f89c5ddf9da933b230e86fa3fa29477dc47b4b':
2015-05-15Merge branch 'mnc-dev-plus-aosp' of ↵Zhijun He
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-dev-plus-aosp
2015-05-15am ac008b79: keep history after reset to ub-camera-haleakalaAlex Cheung
* commit 'ac008b7995cd6956fc466f873ee2d810779a1e9b':
2015-05-15Merge branch 'mnc-ub-dev' of ↵Chris Banes
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev
2015-05-15keep history after reset to ub-camera-haleakalaandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseAlex Cheung
2015-03-18am ef78b471: Merge "Add NOTICE and MODULE_LICENSE files"Conley Owens
* commit 'ef78b471f61e0158ef897bb00e8b2b34747c4bd4': Add NOTICE and MODULE_LICENSE files
2015-03-18Merge "Add NOTICE and MODULE_LICENSE files"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongConley Owens
2015-03-18am ff34a790: Merge "Remove obsolete git submodule path."Bill Yi
* commit 'ff34a79041e88615493c8e32d3ed8758c46cbfdc': Remove obsolete git submodule path.
2015-03-18Merge "Remove obsolete git submodule path."Bill Yi
2015-03-12Add NOTICE and MODULE_LICENSE filesConley Owens
Change-Id: I847b028c8c7eeba78531ddeded1e975c370b9409
2015-03-05Remove obsolete git submodule path.Seigo Nonaka
During resolving confliction in 7993119, .gitmodules are gone, but there is still submodule link in third_party/volley. Due to this incomplete submodule link, "git submodule status" command fails on this repository. Change-Id: Id22da1c7f8757c9e010fbd617f1f08f08c9b0e5d
2015-03-04Remove obsolete git submodule path.Seigo Nonaka
During resolving confliction in 7993119, .gitmodules are gone but there is still submodule link in third_party/volley. Due to this incomplete submodule link, "git submodule status" command fails on this repository. Change-Id: I03201751d7669d3f988f86d5df9f3759cc36feb5
2014-12-03Fix branch/tag specification in glide update scriptAlan Newberger
Script has master hardwired where it should merge to the specified tag. Various ways to do this but since there is a fetch already, it establishes FETCH_HEAD and I use that for both the merge and the rev-parse, tested and it works. Change-Id: I5a7d8cb4e30808a0bb7192367e1486fb85ec008a
2014-12-03Merge tag 'v3.4.0' of https://github.com/bumptech/glide into ub-camera-haleakalaAlan Newberger
Change-Id: Ic290a947323184bfd15576a781bceb88258a5dd1
2014-11-12reset to f18a81f with history.Qiwen Zhao
2014-11-12am f18a81f1: Merge branch \'lmp-mr1-ub-dev\' of ↵Qiwen Zhao
persistent-https://googleplex-android.git.corp.google.com/platform/external/glide into lmp-mr1-ub-dev * commit 'f18a81f1cd0837b11bac8effc74153e6c64d8c5d':
2014-11-12am 1f56f16f: reset to 62c931b with history.Qiwen Zhao
* commit '1f56f16f38b1dd880122d9651fa296b2b511328a':
2014-11-12am 62c931b2: reset to 84f95b9 with history.Qiwen Zhao
* commit '62c931b23f3b3e8ca238721ebb68eaa0700d1586':
2014-11-12am 84f95b98: (-s ours) DO NOT MERGE Avoid NPE in RequestManager shutdownAlan Newberger
* commit '84f95b98ef8232ccce82943456a39f1ae1991f43': DO NOT MERGE Avoid NPE in RequestManager shutdown
2014-11-12am f4eee98d: Ensure overdraw, not overdraw, of reused bitmapsAlan Newberger
* commit 'f4eee98d06c2f8da42f998f89d7e82d0665f55ba': Ensure overdraw, not overdraw, of reused bitmaps
2014-11-12am 2f7d83a1: Synchronize factory key getters in GlideAlan Newberger
* commit '2f7d83a1581be77878112d11046e3efd642e8e16': Synchronize factory key getters in Glide
2014-11-12am 56058fb1: Add support for recursive thumbnail calls.Alan Newberger
* commit '56058fb1edadec8c92e604e74bde41cdf612a78e': Add support for recursive thumbnail calls.
2014-11-12am 39cf2a57: Migrate Glide to default to ALWAYS_ARGB_8888Alan Newberger
* commit '39cf2a57e54423787928bd310ebf9aed2f274f15': Migrate Glide to default to ALWAYS_ARGB_8888
2014-11-12Merge branch 'lmp-mr1-ub-dev' of ↵Qiwen Zhao
persistent-https://googleplex-android.git.corp.google.com/platform/external/glide into lmp-mr1-ub-dev
2014-11-12reset to 62c931b with history.Qiwen Zhao
2014-11-12reset to 62c931b with history.Qiwen Zhao
2014-11-12Add support for recursive thumbnail calls.Alan Newberger
automerge: 56058fb * commit '56058fb1edadec8c92e604e74bde41cdf612a78e': Add support for recursive thumbnail calls.
2014-11-12Migrate Glide to default to ALWAYS_ARGB_8888Alan Newberger
automerge: 39cf2a5 * commit '39cf2a57e54423787928bd310ebf9aed2f274f15': Migrate Glide to default to ALWAYS_ARGB_8888
2014-11-12Add support for recursive thumbnail calls.Alan Newberger
automerge: 56058fb * commit '56058fb1edadec8c92e604e74bde41cdf612a78e': Add support for recursive thumbnail calls.
2014-11-12Migrate Glide to default to ALWAYS_ARGB_8888Alan Newberger
automerge: 39cf2a5 * commit '39cf2a57e54423787928bd310ebf9aed2f274f15': Migrate Glide to default to ALWAYS_ARGB_8888
2014-11-12reset to 84f95b9 with history.android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaseQiwen Zhao
2014-11-07Set version for 3.4 release.Sam Judd
2014-11-06Add pre/postfix to integration source/javadoc jarsSam Judd
2014-11-06Use source strategy in Giphy sample.Sam Judd
2014-11-06Add minimum sdk version to README.Sam Judd
Fixes #234
2014-11-06Explicitly verify state is non null in Drawables.Sam Judd
Related to #233.
2014-11-05Use set style for imports.Sam Judd
2014-11-04Use resetter API in robolectric.Sam Judd
resetStaticState was removed here: https://github.com/robolectric/robolectric/pull/1364
2014-11-04Remove unused code in MemorySizeCalculatorTest.Sam Judd
2014-11-04Add API to fix mark limit/buffer size.Sam Judd
Fixes #225.
2014-11-03Pull out testutil project.Sam Judd
2014-11-03Revert "Avoid expanding buffer to fit entire image."Sam Judd
This reverts commit deef4ae2607fcbd32caffc03e2490cbca9134643. Fixes #231. Reopens #225.
2014-11-03Remove duplicate test class.Sam Judd
2014-11-03Avoid static references to android classes in testSam Judd
Depending on the order tests are run in, this seems to be able to cause errors.
2014-11-03Replace Hamcrest with Truth.Sam Judd
Fewer static imports, better wrangling of generics (particularly when asserting contains), and, least of all, better internal support.
2014-11-02Fix some holes exposed by coverage report.Sam Judd
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 00:53:39 +0000