Age | Commit message (Collapse) | Author |
|
* commit 'acf91e463acf613ddef2e6e6bb68f5d92665f305':
|
|
* commit 'ce1d390fbf0d4cad74dacdc55c0f6b1f98ae5cb1':
|
|
* commit '95e5bc585d1247b8f5a4124c4f6571b38a25cd3d':
|
|
|
|
ub-camera-haleakala
* commit '5fa77ef0dcac04b2f3ef4de25c895ea972be59d3':
|
|
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev
* commit '4496b81c23dbd3a7df732e00713fed93707620f5':
|
|
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-dev-plus-aosp
* commit '7c4f630577f06f7f55edf07698f0578e0266f782':
|
|
|
|
|
|
* commit 'b4b82b7eca1c854469ff2e0e666f7418d946d4b0':
|
|
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev
* commit 'd9f89c5ddf9da933b230e86fa3fa29477dc47b4b':
|
|
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-dev-plus-aosp
|
|
* commit 'ac008b7995cd6956fc466f873ee2d810779a1e9b':
|
|
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev
|
|
|
|
* commit 'ef78b471f61e0158ef897bb00e8b2b34747c4bd4':
Add NOTICE and MODULE_LICENSE files
|
|
|
|
* commit 'ff34a79041e88615493c8e32d3ed8758c46cbfdc':
Remove obsolete git submodule path.
|
|
|
|
Change-Id: I847b028c8c7eeba78531ddeded1e975c370b9409
|
|
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
|
|
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
|
|
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
|
|
Change-Id: Ic290a947323184bfd15576a781bceb88258a5dd1
|
|
|
|
persistent-https://googleplex-android.git.corp.google.com/platform/external/glide into lmp-mr1-ub-dev
* commit 'f18a81f1cd0837b11bac8effc74153e6c64d8c5d':
|
|
* commit '1f56f16f38b1dd880122d9651fa296b2b511328a':
|
|
* commit '62c931b23f3b3e8ca238721ebb68eaa0700d1586':
|
|
* commit '84f95b98ef8232ccce82943456a39f1ae1991f43':
DO NOT MERGE Avoid NPE in RequestManager shutdown
|
|
* commit 'f4eee98d06c2f8da42f998f89d7e82d0665f55ba':
Ensure overdraw, not overdraw, of reused bitmaps
|
|
* commit '2f7d83a1581be77878112d11046e3efd642e8e16':
Synchronize factory key getters in Glide
|
|
* commit '56058fb1edadec8c92e604e74bde41cdf612a78e':
Add support for recursive thumbnail calls.
|
|
* commit '39cf2a57e54423787928bd310ebf9aed2f274f15':
Migrate Glide to default to ALWAYS_ARGB_8888
|
|
persistent-https://googleplex-android.git.corp.google.com/platform/external/glide into lmp-mr1-ub-dev
|
|
|
|
|
|
automerge: 56058fb
* commit '56058fb1edadec8c92e604e74bde41cdf612a78e':
Add support for recursive thumbnail calls.
|
|
automerge: 39cf2a5
* commit '39cf2a57e54423787928bd310ebf9aed2f274f15':
Migrate Glide to default to ALWAYS_ARGB_8888
|
|
automerge: 56058fb
* commit '56058fb1edadec8c92e604e74bde41cdf612a78e':
Add support for recursive thumbnail calls.
|
|
automerge: 39cf2a5
* commit '39cf2a57e54423787928bd310ebf9aed2f274f15':
Migrate Glide to default to ALWAYS_ARGB_8888
|
|
|
|
|
|
|
|
|
|
Fixes #234
|
|
Related to #233.
|
|
|
|
resetStaticState was removed here:
https://github.com/robolectric/robolectric/pull/1364
|
|
|
|
Fixes #225.
|