aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d34c589f4f -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: 72e65f5df5 -s ours am skip reason: Change-Id I1803299b3be7e08fa7086cb04cff4003cbd8527e with SHA-1 8186814f93 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied2fc4af1023b08a1e660ebd26ff594da732acaf
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d34c589f4f -s oursXin Li
am skip reason: Change-Id I1803299b3be7e08fa7086cb04cff4003cbd8527e with SHA-1 8186814f93 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d4aa6774b10924390f231d6178187c5d9910642
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I1803299b3be7e08fa7086cb04cff4003cbd8527e Change-Id: I8e187a5b85f39b8bec728b842f10d89ad3709b7a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53da am: ↵Bob Badour
b3c96bd0a1 am: 5038285319 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ief097f6ef72ed8448a83580c56fd2abbf8ff31ca
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53da am: ↵Bob Badour
b3c96bd0a1 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4bed24fc237fa983f50d458df9a4d8dd1b3c7eb6
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-java am: 2ae4db53daBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1588749 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10afa9b563d74b3d10564de3bf2f54ae1c183c90
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/opencensus-javaandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp api/Android.bp contrib/grpc_metrics/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2a093f420186f13dd1602434dcffd7e1a36846c7
2020-11-24Mark ab/6881855 as merged am: 09b5614f0e am: 8186814f93Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/13110949 Change-Id: Icfeff448376a36e3edb1d1f5035936eb89d8088f
2020-11-24Mark ab/6881855 as merged am: 09b5614f0eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/13110949 Change-Id: I1803299b3be7e08fa7086cb04cff4003cbd8527e
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I2de02ad2bce7a5473bf8dd18e9805c1629c086ee
2020-11-19Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd am: f9977bcb7b am: 49327a8aa1 am: 0c9753c87f Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: I60d49eabd5f64d10ef3ced81146ef7a0e5e637ed
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd am: f9977bcb7b am: 49327a8aa1 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: I53e4f342ee466152f3c0df569cb402b6b2cbaf52
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd am: f9977bcb7b Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: Ia13afcb1188ef09d250400e462412c67c3c84062
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants. ↵Karl Shaffer
am: f02db20ebd Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1503771 Change-Id: Ia7a963ef61628e24c9819d5ffedd4c36253025c8
2020-11-18Update OpenCensus API and gRPC Metrics targets to build Android variants.Karl Shaffer
Migrates the opencensus-java-contrib-grpc-metrics and opencensus-java-api from a java_library_host target to a java_library target that builds both an Android and Host target. For the Android target, ensures that the library is built against the latest public APIs. Test: m opencensus-java-contrib-grpc-metrics Test: m opencensus-java-api Change-Id: I7723daedd338b516cef6daccb41b7eeafec49c72
2020-11-02[automerger skipped] Merge "Add METADATA to opencensus-java: Apache2=NOTICE ↵David Dietrich
am: 4a30687337" into mainline-prod am: 72badb3fe9 -s ours am skip reason: Change-Id Ie50f27b6d5f402754543ae7c05991a72a4b51d59 with SHA-1 4a30687337 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/12797626 Change-Id: Ic2da0e890f7972e8c00a6931f9e3589f4ad2f5f0
2020-11-02[automerger skipped] Merge "Add OpenCensus build modules required for gRPC" ↵David Dietrich
into mainline-prod am: 206703a605 -s ours am skip reason: Change-Id Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7 with SHA-1 9bc011a365 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/12496861 Change-Id: I75c0e424e5db110258d30fc57db304d15030f5fc
2020-11-02[automerger skipped] Resolve merge conflicts am: b4905437c8 -s oursChen Zhu
am skip reason: Change-Id Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7 with SHA-1 9bc011a365 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/opencensus-java/+/12484188 Change-Id: I9118da7d51f2f647828d6ef1cd24b1a345c358ee
2020-11-02Merge "Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337" into ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseDavid Dietrich
mainline-prod
2020-11-02Merge "Add OpenCensus build modules required for gRPC" into mainline-prodDavid Dietrich
2020-11-02Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337Bob Badour
Exempt-From-Owner-Approval: cp of submitted change, needed for rebase Change-Id: I48ea9fe2fba75d6aafcc750d759dba6012e47b6d (cherry picked from commit 433bb01e7f0041e39ae5ae36e50c34e03e6f3639) Merged-In: Ie50f27b6d5f402754543ae7c05991a72a4b51d59
2020-11-02Add OpenCensus build modules required for gRPCHadrien Zalek
Add Soong build modules that are required compile-time and runtime dependencies of gRPC Java client libraries. Note that the current grpc-java-core module is imported which explains why there are no build-time errors. Test: m opencensus-java-api && m opencensus-java-contrib-grpc-metrics Bug: 148404241 Exempt-From-Owner-Approval: rebase, cp of change in other branch Change-Id: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7 Merged-In: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7
2020-11-02Resolve merge conflictsChen Zhu
Bug: 166133969 Test: m Exempt-From-Owner-Approval: rebase Change-Id: I833f4970233abf074303e1bd9cf26d1e3efdcef4 Merged-In: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7
2020-10-26Updates two of the OpenCensus targets to allow for Android use:Karl Shaffer
- Updates the opencensus-java-api target to a java_library that is host_supported from a java_library_host - Updates the opencensus-java-contrib-grpc-metrics target to a java_library that is host supported from a java_library_host - Above updates part of a greater change to enable the Java gRPC Client Libraries to be built for Android devices Test: m opencensus-java-api Test: m opencensus-java-contrib-grpc-metrics Bug: 168812332 Change-Id: Ia395992a19e03ee494a02c79e8f1192a0937ee91
2020-06-26Use AutoValue from external/auto am: 65f84045ca am: fe73ffc2f9 am: ↵Colin Cross
1fda73121f am: 164fe60475 am: fdea1900c4 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1344742 Change-Id: I190837a621a23e09a932fb26936f19655bbc6bde
2020-06-26Use AutoValue from external/auto am: 65f84045ca am: fe73ffc2f9 am: ↵Colin Cross
1fda73121f am: 164fe60475 Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1344742 Change-Id: I6501f5d1f5f0661337aedd4d3b15eeb6becea453
2020-06-26Use AutoValue from external/auto am: 65f84045ca am: fe73ffc2f9 am: 1fda73121fColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1344742 Change-Id: I213cd18fb4ec07c305bedc634ba64bf696de0878
2020-06-26Use AutoValue from external/auto am: 65f84045ca am: fe73ffc2f9Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1344742 Change-Id: I82454492046f2caab5f6c86c0db78b3b3c470839
2020-06-26Use AutoValue from external/auto am: 65f84045caColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/1344742 Change-Id: Ib40ca762d6709eb5c7d23afe0281c688ad012830
2020-06-19Use AutoValue from external/autoandroid-r-beta-3android-r-beta-2Colin Cross
Use the AutoValue built from source instead of the prebuilts from external/dagger2. Bug: 158870037 Test: m checkbuild Change-Id: I29b9f02f81ec294b02df8b575770d956b9c4cafa
2020-05-29Add OpenCensus build modules required for gRPC am: 9bc011a365 am: 1b51202d67 ↵Hadrien Zalek
am: 32c8db9f77 am: 49a7f2b543 am: ce734193de Change-Id: I259c2b8e4b1212788d46201a9c28c6467442e038
2020-05-29Add OpenCensus build modules required for gRPC am: 9bc011a365 am: 1b51202d67 ↵Hadrien Zalek
am: 32c8db9f77 am: 49a7f2b543 Change-Id: Ie817393fbd8c4e4ab145b3eb75762c756917e399
2020-05-28Add OpenCensus build modules required for gRPC am: 9bc011a365 am: 1b51202d67 ↵Hadrien Zalek
am: 32c8db9f77 Change-Id: I90b8d7abdb7974ad5d9e5a0a8aa81df2155d6b8c
2020-05-28Add OpenCensus build modules required for gRPC am: 9bc011a365 am: 1b51202d67Hadrien Zalek
Change-Id: Ia660e269a9dfa8bf4643c0e2368794661d779a5a
2020-05-28Add OpenCensus build modules required for gRPC am: 9bc011a365Hadrien Zalek
Change-Id: I84e03c615028f9180f67e30241afcd6a9334ec7a
2020-05-27Add OpenCensus build modules required for gRPCHadrien Zalek
Add Soong build modules that are required compile-time and runtime dependencies of gRPC Java client libraries. Note that the current grpc-java-core module is imported which explains why there are no build-time errors. Test: m opencensus-java-api && m opencensus-java-contrib-grpc-metrics Bug: 148404241 Change-Id: Ie92d1ca959ca2104bae7b92b4509b42f8e4184f7
2020-04-30Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337 am: ↵Bob Badour
433bb01e7f am: 284017ea8c am: ebfc0f45f3 am: f6185d5a70 Change-Id: I567ca5009192b79e6093528b208c3e1f04ed64e7
2020-04-30Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337 am: ↵Bob Badour
433bb01e7f am: 284017ea8c am: ebfc0f45f3 Change-Id: Ib0c38aab6fbf05479c9ab9b94a9311088fb4a309
2020-04-30Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337 am: ↵Bob Badour
433bb01e7f am: 284017ea8c Change-Id: I58e888e0a5e901c9f30ab0a969fab5d2e898aefc
2020-04-30Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337 am: 433bb01e7fBob Badour
Change-Id: I9f52c0161a54ba8e5b56be4c63ee539790a2a2ae
2020-04-30Add METADATA to opencensus-java: Apache2=NOTICE am: 4a30687337Bob Badour
Change-Id: I48ea9fe2fba75d6aafcc750d759dba6012e47b6d
2020-04-29Add METADATA to opencensus-java: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ie50f27b6d5f402754543ae7c05991a72a4b51d59
2019-01-04Add default active developers into OWNERS am: 13ad3cf836 am: 978688e540q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-11.0.0_r9android-mainline-11.0.0_r35android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-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_r4android-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_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-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_r10android-11.0.0_r1android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-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-platform-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseChih-Hung Hsieh
am: ae913c9b63 Change-Id: I8ab95b2c35dd3ef980a9a6bf3d365971d4dc66e7
2019-01-04Add default active developers into OWNERS am: 13ad3cf836Chih-Hung Hsieh
am: 978688e540 Change-Id: Ice66dfdf79984428488ca807d11122b3879bb9f5
2019-01-04Add default active developers into OWNERSChih-Hung Hsieh
am: 13ad3cf836 Change-Id: I9d4a24514ff2e27a5fbb9b58abc657cc0abf1cb4
2019-01-04Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Idfab6179231501818d4b75d5132b9e180e9b45d9
2018-10-22Merge remote-tracking branch 'aosp/upstream-master' into merge am: ↵Julien Desprez
dd3cabeacc am: 6fbc3cf5a1 am: 13217871fe Change-Id: Icfe12d6db2f81a6f5c65241919b1d63fb665ffd6
2018-10-22Merge remote-tracking branch 'aosp/upstream-master' into merge am: dd3cabeaccJulien Desprez
am: 6fbc3cf5a1 Change-Id: I11b0ec1cf561d2a14da78e444b1594f167787fe6
2018-10-19Merge remote-tracking branch 'aosp/upstream-master' into mergeJulien Desprez
am: dd3cabeacc Change-Id: Ib77ae649a4106599080887b1b4aabd3b3e7cefa7
2018-10-19Merge remote-tracking branch 'aosp/upstream-master' into mergeandroid-wear-8.0.0_r2Julien Desprez
Test: None Change-Id: I8a34a16c1ec7981a9cc93758e216ae54bac986f6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 15:49:36 +0000