aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: b47af415ba -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: 435a78dc16 -s ours am skip reason: Change-Id I99d1c607b381288c4a0c4c777c019921181616b0 with SHA-1 bfa72e915a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I99e224b67ecba45fa364f6512c1c97dd37d42872
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: b47af415ba -s oursXin Li
am skip reason: Change-Id I99d1c607b381288c4a0c4c777c019921181616b0 with SHA-1 bfa72e915a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I678caca49792ce85c6043782719e19517412abb0
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I99d1c607b381288c4a0c4c777c019921181616b0 Change-Id: I0dc71df8794a2d165f3d4815c110436522024448
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/volley am: 507ceb67e4 am: ↵Bob Badour
cb7f5ca009 am: c7617f1baf Original change: https://android-review.googlesource.com/c/platform/external/volley/+/1576035 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4587219dc7be39a88e5618b8cd8ca14e3f4d7cdf
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/volley am: 507ceb67e4 am: cb7f5ca009Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/volley/+/1576035 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I261c52db6874b6b44eb91003422f4d621345e6c8
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/volley am: 507ceb67e4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/volley/+/1576035 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6c9be1370e4a6c9a6b4a732cf7b97ecb079cbab
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/volleyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I00c4dc1bf8b9aeb94be8763330448c8c8808e5b9
2020-11-25Mark ab/6881855 as merged am: 816a372ad9 am: bfa72e915aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/volley/+/13111420 Change-Id: I52f437fc5b11d7466eb1ce31b2a79cfc5f198d2e
2020-11-25Mark ab/6881855 as merged am: 816a372ad9Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/volley/+/13111420 Change-Id: I99d1c607b381288c4a0c4c777c019921181616b0
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie75baec709bf8ac786637b8b0c318a93ae14c365
2020-10-12[automerger skipped] Skip ab/6749736 in stage. am: 7973ef375a -s ours am: ↵Xin Li
80523077ae -s ours am: e56d846c5b -s ours am skip reason: Change-Id I3d1130346775b6c0552f3c42aaf1625a8b4636a5 with SHA-1 c59480f818 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/volley/+/12797282 Change-Id: Ib70829f23bf234ad9207b5ea67cc45d6d8651c2f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7973ef375a -s ours am: ↵Xin Li
80523077ae -s ours am skip reason: Change-Id I3d1130346775b6c0552f3c42aaf1625a8b4636a5 with SHA-1 c59480f818 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/volley/+/12797282 Change-Id: I3862048046ecc90ee8f266675ddb486508652b6e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7973ef375a -s oursXin Li
am skip reason: Change-Id I3d1130346775b6c0552f3c42aaf1625a8b4636a5 with SHA-1 c59480f818 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/volley/+/12797282 Change-Id: I8dc1fb553a8355e5f803f4b839bbacf8fda7613e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I3d1130346775b6c0552f3c42aaf1625a8b4636a5 Change-Id: I15a973448b485e859488575dc57ad189024f54ac
2020-10-07Import of Volley from GitHub to AOSP. am: b6bd7aa39d am: 839f7a7fb2 am: ↵Anonymous
a0f072f60a am: 82c0ddbc31 Original change: https://android-review.googlesource.com/c/platform/external/volley/+/1452115 Change-Id: I767128058dc98dc3fac79e54f3a10cf6a2a2db6e
2020-10-07Import of Volley from GitHub to AOSP. am: b6bd7aa39d am: 839f7a7fb2 am: ↵Anonymous
a0f072f60a Original change: https://android-review.googlesource.com/c/platform/external/volley/+/1452115 Change-Id: Ia09e4f359a6aa3580b18190e6a5617143df2e243
2020-10-07Import of Volley from GitHub to AOSP. am: b6bd7aa39d am: 839f7a7fb2Anonymous
Original change: https://android-review.googlesource.com/c/platform/external/volley/+/1452115 Change-Id: Ic67a17b663ac7d6e51c2a1540a5a4440e51ee339
2020-10-07Import of Volley from GitHub to AOSP. am: b6bd7aa39dAnonymous
Original change: https://android-review.googlesource.com/c/platform/external/volley/+/1452115 Change-Id: Iadd2169340e108b4619a67d6af53fa31da11399c
2020-10-07Import of Volley from GitHub to AOSP.Anonymous
Includes AsyncRequestQueue and asynchronous infrastructure, but the Cronet-based components are excluded from Android.bp as Cronet is not broadly exposed for application usage. - ae701b33e718782e914108f9b6d1f1bb5f1ab7f8 Fix empty responses when content length is unknown. by Jeff Davidson <jpd@google.com> - 055fc535255367e5556d6274aadcbb5cd3be5ed3 Add hook to allow customization of UrlRequest.Builder. by Jeff Davidson <jpd@google.com> - bc64707525d43b2ddc1cad08a3445cc34111c47f Set Content-Type header for requests with bodies. (#371) by Jeff Davidson <jpd@google.com> - 4083c43bcfc8cc31be709574f6d1b923c2bf869d Add cURL logging support to CronetHttpStack. (#370) by Jeff Davidson <jpd@google.com> - 46a4f9040126940be79b10633be470dea32958a3 Fix dependencies from base Volley package to toolbox pack... by Jeff Davidson <jpd@google.com> - cde6d4367210819f357b1397d17b4656b773a0d9 Provide a ScheduledExecutorService to AsyncRequestQueue/A... by Jeff Davidson <jpd@google.com> - f582ee6f7b7067b6bce21239f904f3066b778dad Move CronetHttpStack tests to the expected location. (#368) by Jeff Davidson <jpd@google.com> - a4954c6661b01a5950f973d873b8e21d2a5dcc40 Revert DiskBasedCache. (#366) by Jeff Davidson <jpd@google.com> - 7b0a3119b499989c31611a8fb944015aa9a400c5 AsyncRequestQueue implementation + some tests (#361) by sphill99 <s.phill99@gmail.com> - d777e8a7bc4136b311913178021894adec73bfdb Created builder for DiskBasedAsyncCache (#360) by sphill99 <s.phill99@gmail.com> - 3ff2427da1db5c5a46c1dfa0aaf7c097258be7ce AsyncNetwork implementation as well as unit testing (#357) by sphill99 <s.phill99@gmail.com> - bb85de2f41a1bf9fe8b1ef15a41a9057947a0724 Added licensing headers for all newly created files (#358) by sphill99 <s.phill99@gmail.com> - 82c828d65a8f317a55a1a7b067a60df8fe566a02 AsyncHttpStack and Cronet implementation. Limited unit te... by sphill99 <s.phill99@gmail.com> - d0fb8dea486cc9b164cf140661225160dd5454d7 Implementations for rest of AsyncCache, tests for cache m... by sphill99 <s.phill99@gmail.com> - 94e3a4da70cf1803426de6a2579676966c670d78 Include license in generated POM file. (#352) by Jeff Davidson <jpd@google.com> - cae1570bc5d96cd2b840b39e5c742a397c76b45f Put implementation for async cache that uses callback met... by sphill99 <s.phill99@gmail.com> - a791d09a6747ca4923352405b20c229eafad5866 Get Implementation in AsyncCache that takes in a callback... by sphill99 <s.phill99@gmail.com> - 504e41a1c749ebbf3b63b6ab58533c8219cb6df1 Retry on NoConnectionError (#342) by sphill99 <s.phill99@gmail.com> - 40d4ffb7ec5dab4cfb32d6d19db8f45419742671 Fixed testCompile and testApi deprecations (#341) by sphill99 <s.phill99@gmail.com> - 7c767521db6aab17cb706d114570a557dc1c1efa Fix Android Studio project import of Volley. (#335) by Jeff Davidson <jpd@google.com> GitOrigin-RevId: ae701b33e718782e914108f9b6d1f1bb5f1ab7f8 Change-Id: I8f5792f679e88591c213156dcdd13482105e1c53
2020-05-06Update minSdkVersion/compileSdkVersion used for Volley builds. am: ↵Jeff Davidson
03f9929f4b am: c60e1cfe5b am: dc9062756c am: c59480f818 am: ac0ecd4e10 Change-Id: Ia789fa05059dc856955d8ffb7edcacc1d30b2274
2020-05-06Update minSdkVersion/compileSdkVersion used for Volley builds. am: ↵Jeff Davidson
03f9929f4b am: c60e1cfe5b am: dc9062756c am: c59480f818 Change-Id: I2ebf59e69063f465cbca3563f76a33c903805cc4
2020-05-06Update minSdkVersion/compileSdkVersion used for Volley builds. am: ↵Jeff Davidson
03f9929f4b am: c60e1cfe5b am: dc9062756c Change-Id: I3d1130346775b6c0552f3c42aaf1625a8b4636a5
2020-05-06Update minSdkVersion/compileSdkVersion used for Volley builds. am: ↵Jeff Davidson
03f9929f4b am: c60e1cfe5b Change-Id: I3d748614dd1e9d043a1bb6041afce3a2ab80ee24
2020-05-06Update minSdkVersion/compileSdkVersion used for Volley builds. am: 03f9929f4bandroid-r-beta-3android-r-beta-2Jeff Davidson
Change-Id: If528cc2c27e8da98a94c54b46666e53f5956443c
2020-05-06Update minSdkVersion/compileSdkVersion used for Volley builds.Jeff Davidson
This syncs with build.gradle and will keep the build consistent once https://github.com/google/volley/pull/335 is merged. Change-Id: Icae708d2bdf8d384f4a935879b6520dba2dfeb0d
2020-04-30Import of Volley from GitHub to AOSP. am: ec9c6e0d0e am: 728463db3d am: ↵Anonymous
b9cc074bb2 am: 62cc742dae am: 3204c784d2 Change-Id: Ia61d43b55ca2836f8f4c0cb77d562e23a102480c
2020-04-30Import of Volley from GitHub to AOSP. am: ec9c6e0d0e am: 728463db3d am: ↵Anonymous
b9cc074bb2 am: 62cc742dae Change-Id: I5bc85ebb3effb6ca022449b9d55a8d8b0b5fee58
2020-04-30Import of Volley from GitHub to AOSP. am: ec9c6e0d0e am: 728463db3d am: ↵Anonymous
b9cc074bb2 Change-Id: Id4342c36ff7c7f8486417bf9706e2432c9ab8d0a
2020-04-30Import of Volley from GitHub to AOSP. am: ec9c6e0d0e am: 728463db3dAnonymous
Change-Id: Ie28974d82cbe58fb87f1fc45e268b9066800d666
2020-04-30Import of Volley from GitHub to AOSP. am: ec9c6e0d0eAnonymous
Change-Id: Id4f28845afa5fd89dc55d0316c7760166f361afd
2020-04-30Import of Volley from GitHub to AOSP.Anonymous
- c9b2623cb524d2ec29a5a7f012528115f45b24cd Tolerate null header maps in HttpHeaderParser. (#334) by Jeff Davidson <jpd@google.com> - 455a16125ae9d01176d68a2ea7d4747130e55801 Allow creation of custom input/output streams in HurlStac... by Nicolas <ndagnas@live.fr> - addc11dbd37bd3a5d8136557076af0e8d0a995a4 Annotate more nullable methods and fields (#333) by Julien Biral <jbir789@users.noreply.github.com> - d41f34a43520cd1d30fe71ada3271161adb0e9c0 Add @Nullable annotations to Response (#325) by justin-morey <justin.morey@gmail.com> - 8a3a7baa07dda3fb4c5d561664470311c13d215b Send request to network when cache entry parsing fails (#... by Ulrike Hager <uhager42@gmail.com> - 514eac8c33492f69f62799dcd3669c877474626c Re-initialize the cache if the directory was deleted. (#2... by Ulrike Hager <uhager42@gmail.com> - b95b0159a14f053590cb18fd1cf3a1b159e478a1 Fix timezone formatting for RFC1123 on some Android devic... by Jeff Davidson <jpd@google.com> - 96c88101bcb6139fc9dd2ded4ef7c0008085d4b1 httpheaderparser: log invalid date headers only verbosely... by Florens <Floens@gmail.com> - 8e7a6dbf4dfbea56da48814ecf6e7270dcec9b0f Allow Volley.newRequestQueue() to be called on main threa... by Yuhan Zhao <poligun@gmail.com> GitOrigin-RevId: c9b2623cb524d2ec29a5a7f012528115f45b24cd Change-Id: I8e677f68212e6ba0812f398744895a1a12b6ed70
2020-04-29Add METADATA to volley: Apache2=NOTICE am: 582bbb8229 am: ae005a4c3f am: ↵Bob Badour
4bd4d04be4 am: 83daffd3c9 am: ee3b4d8a74 Change-Id: I606236cb2bf415c1f216418ec71bb95be65eec72
2020-04-29Add METADATA to volley: Apache2=NOTICE am: 582bbb8229 am: ae005a4c3f am: ↵Bob Badour
4bd4d04be4 am: 83daffd3c9 Change-Id: I61ade26340aa0a6cdfe727e8e0cbcb86524d323c
2020-04-29Add METADATA to volley: Apache2=NOTICE am: 582bbb8229 am: ae005a4c3f am: ↵Bob Badour
4bd4d04be4 Change-Id: Iddcf98f84b7c5b704fd104fdd9a160d737780b5c
2020-04-29Add METADATA to volley: Apache2=NOTICE am: 582bbb8229 am: ae005a4c3fBob Badour
Change-Id: Ib4a18e5c3763346fbefb366bf764bd79e3eadab1
2020-04-29Add METADATA to volley: Apache2=NOTICE am: 582bbb8229Bob Badour
Change-Id: I579028d05e728069ff1d0c1ae0d98b2ec5900c12
2020-04-28Add METADATA to volley: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Idadce509831b2fb82ca8d2de1c8f69bec7d667b9
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2f49efe5c7 -s ours am: 26403edc91 am: 956475adc8 am: d4776d75f0 -s ours am skip reason: subject contains skip directive Change-Id: I915e225b65728c53f12b40815c0a4b8442343dc0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2f49efe5c7 -s ours am: 26403edc91 am: 956475adc8 Change-Id: I91087594ce529045c3b46e2ec60f67b4abdd82d0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2f49efe5c7 -s ours am: 26403edc91 Change-Id: Id55d985f222db1ec3358c9beaf3fa7bc4711f8f7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2f49efe5c7 -s ours am skip reason: subject contains skip directive Change-Id: Ibb349a547751f0502543b689b11d76d42c54e815
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ia826a38a013bf6384795861b586063f855708f4f
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0088f462c9 am: 7559e17037 ↵Bob Badour
am: 305bbdd16b am: 3556d072fd am: 842b744011 Change-Id: Id25336278a7d65a0f4ae1bf48d2a710e8042a142
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0088f462c9 am: 7559e17037 ↵Bob Badour
am: 305bbdd16b am: 3556d072fd Change-Id: I3c035e7117355e3f7fd5b8762d7bf4a612083c97
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0088f462c9 am: 7559e17037 ↵Bob Badour
am: 305bbdd16b Change-Id: I351fb95d085c6b1341517e925d533c24b884ffc3
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0088f462c9 am: 7559e17037Bob Badour
Change-Id: Id5cdac0af7460dbccf12651f8f8bae902964bda1
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0088f462c9 am: 7559e17037Bob Badour
Change-Id: Iec601419f02fb470afe37b356fb96a8b69a25c51
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0088f462c9Bob Badour
Change-Id: I6f410decec61fa18c04f1f8e2b148277b95a0187
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I324b4f970e0841991227af62da560930ca748900
2019-04-09Import of Volley from GitHub to AOSP. am: 5de194ffbe am: eb505c21b4r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseAnonymous
am: ab93ab6a71 Change-Id: Icbeaee1104febc2c97c2ce721851f67b4bd0ca09