Age | Commit message (Collapse) | Author |
|
ANYWHERE 2p: b3a4b4db6e am: 8f6192cd94 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156
Change-Id: I345c8af0e4b0a114900f3b4cf36a639c37fb92de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156
Change-Id: Ie020bab22e416723a488bac2cee65db7886f1f66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ANYWHERE 2p: b3a4b4db6e am: 8f6192cd94 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156
Change-Id: I90c3770c0a96105269a586867e83caba21e590c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
|
|
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b3a4b4db6e
Import translations. DO NOT MERGE ANYWHERE
|
|
9ec539e294 -s ours am: 5a87ce1b03 -s ours am: 675d306424 -s ours am: 015d69955e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654
Change-Id: Iee892fb245f32acd864f67a6e443b20c7d93784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
9ec539e294 -s ours am: 5a87ce1b03 -s ours am: 675d306424 -s ours am: fbcee0630f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654
Change-Id: I9d737c13d14de732abae8b885c34bdaca139d925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
9ec539e294 -s ours am: 5a87ce1b03 -s ours am: 675d306424 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654
Change-Id: I0a3b50e8b624764c173015569b22ea198f2c6a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
9ec539e294 -s ours am: 5a87ce1b03 -s ours am: 675d306424 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654
Change-Id: I030a7bfb3e7138564568db4faea98d55148f6283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
9ec539e294 -s ours am: 5a87ce1b03 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654
Change-Id: I9ff60ec967a75fbe898c1138b80eeb8cbe846490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
9ec539e294 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654
Change-Id: I93dafc01cf3797053c681f0961a9c9fa015452d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156
Change-Id: Ica181192dc057cbe321cab3bdc61dcc69c594fd8
|
|
Auto-generated-cl: translation import
Change-Id: I864dc0bcef3e7a654f01771c04a1a6ca30b790b6
|
|
Auto-generated-cl: translation import
Change-Id: Iaf32c36c65314a371642a30ecb2bba251adbc20c
|
|
Auto-generated-cl: translation import
Change-Id: Ic3c21706454d6c1ecf9b4f14bb8338a7fd843d74
|
|
stage-aosp-master am: 66bef1dfee -s ours am: 7a5b14bd26 -s ours am: c5a5a94e38 -s ours am: c7e6a4121e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: I189017b37e455b19abfaad7de90ac8fd9911e1ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
d92da8adff -s ours am: 956107b4a1 -s ours am: 00ed4fea00 -s ours am: 0298d17666 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: I4946257fe238fbfaf691e36fefeba70dce54e352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0ed48f3581 -s ours am: ff3b8ffe16 -s ours am: 31583166d1 -s ours am: ddfaf5c1dd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179
Change-Id: I97ad71852e9e74cc57870db003e711e019b4d8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
stage-aosp-master am: 66bef1dfee -s ours am: 7a5b14bd26 -s ours am: c5a5a94e38 -s ours am: cd98f57054 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: Ibd8c44316b18aa31e37c519de7eac38683c51440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
d92da8adff -s ours am: 956107b4a1 -s ours am: 00ed4fea00 -s ours am: baec90cc36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: Ia842c965ba4bf5eea45cff277a4aa794ddf75760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0ed48f3581 -s ours am: ff3b8ffe16 -s ours am: 31583166d1 -s ours am: 8c8ca5767f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179
Change-Id: I53023d33684e1d007bfbdd2e64de32f108f53d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
stage-aosp-master am: 66bef1dfee -s ours am: 7a5b14bd26 -s ours am: c5a5a94e38 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: Ieb98dd35be80783692ebff5167100aabaa5ab179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
d92da8adff -s ours am: 956107b4a1 -s ours am: 00ed4fea00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: I89390b6f917c3b14720a66618fcfbebd948b5c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0ed48f3581 -s ours am: ff3b8ffe16 -s ours am: 31583166d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179
Change-Id: I33badac93c7cf07084c486d872806a1390113444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
stage-aosp-master am: 66bef1dfee -s ours am: 7a5b14bd26 -s ours am: c5a5a94e38 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: Ic452d33a6dc0b43730924d0a8b83cc4312bfc600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
d92da8adff -s ours am: 956107b4a1 -s ours am: 00ed4fea00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: I53ded546f2d8405bdc8eb1578d5d3b7eb739d171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0ed48f3581 -s ours am: ff3b8ffe16 -s ours am: 31583166d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179
Change-Id: I615f2df0c9f5728c00ed6932ff16c40f8813b339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
stage-aosp-master am: 66bef1dfee -s ours am: 7a5b14bd26 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: Idee635caf4c15df7f2fbd74ad8ed250871423cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
d92da8adff -s ours am: 956107b4a1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: I1ce9448184def866c31ea95c4e0382a9193c47e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0ed48f3581 -s ours am: ff3b8ffe16 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179
Change-Id: I51b9f3dd811e1461e467ae50ca952f522a5063f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
stage-aosp-master am: 66bef1dfee -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: Ia09654586cba6be93f264693a9fadba6e6e0fce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
d92da8adff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180
Change-Id: Ibcb096211aa6ef66491caae74c6a7be98ff6f15b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0ed48f3581 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179
Change-Id: Ibe022189e36ab4a7d037c88d9f1a8a132d29bd83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
|
|
Auto-generated-cl: translation import
Change-Id: I606a92a21581c5ab64770b75e7b80da7f2d6d56e
|
|
Auto-generated-cl: translation import
Change-Id: Ibfefeedbebaa7766fac5e9da6f0c6d8ac81c9eb5
|
|
Change-Id: If8dbb38d646e8b96c39e7c52bae47bc05acbd29a
|
|
0da01a5946 -s ours am: 88b60e7db8 -s ours
am skip reason: Merged-In Ide26e9310f6057a44cbaa6c07b6475e3ad893dd2 with SHA-1 fe40e72682 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20956668
Change-Id: I906db112422209075731455b20dd76386c53939e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
0da01a5946 -s ours
am skip reason: Merged-In Ide26e9310f6057a44cbaa6c07b6475e3ad893dd2 with SHA-1 fe40e72682 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20956668
Change-Id: If732e5474f0e8e39d5338872368d685024e86eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
tm-mainline-prod am: 10a39ac8aa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20847212
Change-Id: Id564de39ee3f0c0cbc634a19dff1b63f2b853f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
928ddff7c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20847212
Change-Id: Ia1c981ffe6ed14b711453046f6db48ab8d25e0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
e84259b6d9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20847213
Change-Id: I16a2d79f0e088d225198068860eb271b6bbb945e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 264720040
Merged-In: Ide26e9310f6057a44cbaa6c07b6475e3ad893dd2
Change-Id: Ic518b50bfb6c5a24add59e62deed499bc2310bbc
|
|
tm-mainline-prod am: 57a3ce0c8c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758374
Change-Id: Ia93744dfba20876e36b48ceb835327d5a3b716e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
16106f8077 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758374
Change-Id: I7c7ea36e6499d0f932b7a353757ba481eeff6e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
bd3fbfdb9e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758847
Change-Id: Ic546810592d97187663aa2b2367e1ec57d66947f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
tm-qpr-dev am: 77d8ed7bfd -s ours am: 6a032058f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846540
Change-Id: I7460ce354ff1233a07d047bc5ac0000f9c10bcd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
fe40e72682 -s ours am: 565efadf16 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846540
Change-Id: Iaabccbae3ef32d1983fe35b37bb86e138ee74bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
965811ef4a -s ours am: 288990ef89 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846539
Change-Id: I61472ae45e0e3007e2d9f36ab4a1d734e1c11e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
tm-qpr-dev am: 77d8ed7bfd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846540
Change-Id: I2da6a8fe6627a8403cb4c593f051fc6636b307bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|