Age | Commit message (Collapse) | Author |
|
Change-Id: I4dae42a28994a9c4f7990fcecd0fe011724ce74e
|
|
When the buffer size is equal to string size,
the func in icu just return warning U_STRING_NOT_TERMINATED_WARNING
which is a negative number, and U_FAILURE would fail if error number
greater than zero only.
This would cause non null terminated string passing into following funcs
and causing different types of crash
This fixes the previous partial fix.
Bug: 248612953
Bug: 239210579
Bug: 249151446
Bug: 239267173
Test: locale_fuzzer
Ignore-AOSP-First: security
Merged-In: I651d1ff64d06b4c30e18ee69772f52a60aa5ff7a
Change-Id: I651d1ff64d06b4c30e18ee69772f52a60aa5ff7a
(cherry picked from commit 582927b0d6c6920ee6a04049eaa9e68608cfc888)
(cherry picked from commit a8265407660edaa1006545a6401d6409c05acb5d)
Merged-In: I651d1ff64d06b4c30e18ee69772f52a60aa5ff7a
|
|
tm-qpr1-release
Change-Id: I3ce238d1a64c78d1efd04440dcdb20194b3ad394
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: ddcedcd3ce -s ours am: f3b309c3c4 -s ours am: a1c8d68fe6 -s ours am: 7c0ed38ed3 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: I04339e56a611960cf2ecae8821fd853c3bcc6bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: aa6c2c7aaa -s ours am: d22c344bc5 -s ours am: 68095e7a13 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: Idd2367211c85bb3682d4b7b47bf25f4f5968e8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: ddcedcd3ce -s ours am: f3b309c3c4 -s ours am: a1c8d68fe6 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: Ica7876096307d371b3679a714fad3361894efaff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: aa6c2c7aaa -s ours am: d22c344bc5 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: I2702ccb83d59579a44ba18972213abd8e4c8f0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: ddcedcd3ce -s ours am: f3b309c3c4 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: I3b3dfa3df616a7a80b723c40f8be57beaca90942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: ddcedcd3ce -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: Id782d5bd0f73f03fca9fc43586a91fdceb8746fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours am: aa6c2c7aaa -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: Iaf3bec52507422ad81c1875b53983d40d83fa5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours am: f919708306 -s ours am: 6143bef72a -s ours am: 3837085721 -s ours am: 6321340ac4 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: I943be32ccf3eb9da2b0099d44ca22a67c25dfe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours am: c027989711 -s ours am: cedd4e8d50 -s ours am: 32d1a4aec5 -s ours am: 57cda42449 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: Ib88abb36cd11a730bcd5df80ab721ab013bc25b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours am: fae1766cc0 -s ours am: 2be1f0b76b -s ours am: 45ff4c7006 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: I8a3c8f867bc9696b5baf155862a2c45bdc1251af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours am: 948e1a594c -s ours am: ffb965bbc5 -s ours am: 5e00575756 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: Ie6b58afe6d163fffc9047d75329d935b04f2da5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: I1fe4657d5598a0ee63407625d200df34f3911d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours am: 3de50d11b6 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: If995c822c6f070fd5b25623911cfb9ddcd95503c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours am: f919708306 -s ours am: 6143bef72a -s ours am: 3837085721 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: I2d9931befcd65e5e7cee3dd53ed701d32793c494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours am: c027989711 -s ours am: cedd4e8d50 -s ours am: 32d1a4aec5 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: Ic5ad03937ad087f1d84a11f0b882aa3a6ddfb8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours am: fae1766cc0 -s ours am: 2be1f0b76b -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: Ic24021104c9f7da6dedf6c858e81b3e4a4276c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours am: 948e1a594c -s ours am: ffb965bbc5 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: I20ae7994ae1ffb00293e5ad79db2deaef88cab34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours am: f919708306 -s ours am: 6143bef72a -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: Ib473bdb6801ab19158507fe88549ac57d95971d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours am: c027989711 -s ours am: cedd4e8d50 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: Idfeff9f94700bf9a48fa2c7b45e019b25209a72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours am: fae1766cc0 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: I81a5782d7891709d2b3a94c5dc9ab62e2e845276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours am: 93ada3e4ab -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: Ie1444568d38ef9aaf95ed1575538223e8a6f9707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours am: f919708306 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: Idde6b9217e3a32db5733d786236f6aa06be350cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours am: c027989711 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: I11e6b61803ebd0f759ec3fc385a0f4ee7fd1932a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours am: 948e1a594c -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: I25a982529bca1264bdb9583af83eabe78654c187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours am: 4504ca09c5 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: I19b0eb83e89b03f6d32fdd0e8bc706f3f0800723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
"presubmit-am-319ef745e4a34d1597f2c65ab319049d" into sc-qpr1-dev am: 3cb4530a3b -s ours am: 71d080d140 -s ours am: ca94858495 -s ours am: ae8f44d204 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: If832b867e63098690b9b4743b1ac36ceb57c16ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
fde7f4a25c am: 1af0bef572 -s ours am: a5ce29f6e9 -s ours am: 41e21d1d63 -s ours am: cc8f388484 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: I72fa55651f3c34df4c22c42467d53052d0cec8e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 9484e0ad10 -s ours am: e07e900e0a -s ours am: de64b00102 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980643
Change-Id: Iace8b62f7a7161fb3706ca5393435dc5e747dff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 853747eec0 -s ours am: fdf82a01fb -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 d5d0c70c3c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980642
Change-Id: I95550b128fd3663b066e072219112e4f8a71abff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 2a4acca2b1 -s ours am: 7df69f58c4 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980641
Change-Id: I7583d3ca97451c6b4f0a38864428d15270509212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: c801109095 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980641
Change-Id: Ie35fd74a5276ca0fc1c7b29178c8fe9e1c0dbe37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
fde7f4a25c 2p: 3c8849d9bb am: b0c81c9062 am: 2d0aa9dc4b -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 b215af1ecb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: I1428f190cdcbc3930bab2518f53c411b6d98d550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
"presubmit-am-319ef745e4a34d1597f2c65ab319049d" into sc-qpr1-dev am: 3cb4530a3b -s ours am: 71d080d140 -s ours am: ca94858495 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: I6a50de554addba45028f102b439f82cb7169d04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
fde7f4a25c am: 1af0bef572 -s ours am: a5ce29f6e9 -s ours am: 41e21d1d63 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: I5295023c51afb3728825e4f634d39e8ff02e551b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 9484e0ad10 -s ours am: e07e900e0a -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980643
Change-Id: I5c50dabe7fefa6e612c4ceb7a050df9f060a4ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: I797f589d219b8dca022dcdb125cf271a7bc05c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: I424429566e1541da886cb5c1f0f37837821852f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: f06d71d0b0 -s ours am: a4b763f4a2 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 a0b150beef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981385
Change-Id: I2fd92cd515157ee0101999a5b53c7e77c5c7d1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 4b2d0adc00 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981137
Change-Id: I8cc168e9099351b6236b539b11760730e419f60e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
"presubmit-am-319ef745e4a34d1597f2c65ab319049d" into sc-qpr1-dev am: 3cb4530a3b -s ours am: 71d080d140 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: Ia74a09593e7bb48aa912f7321a76be00653ceea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
fde7f4a25c am: 1af0bef572 -s ours am: a5ce29f6e9 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: Id2e2e3c4fee22e79f700938e0c0e7056354fce86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 9484e0ad10 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980643
Change-Id: I1ff35202bd376f176cba1d818db0610c07b6c237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4658663d14 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 df1b59a776 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981136
Change-Id: I3efdb4af5342012ba468d3b6363f472ac6a58d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours am: 853747eec0 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 d5d0c70c3c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980642
Change-Id: If455058058e201dd5737147e1fd31d96a10987aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
"presubmit-am-319ef745e4a34d1597f2c65ab319049d" into sc-qpr1-dev am: 3cb4530a3b -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: I90dfde55efed92fe9581684f8c38dd52e6a9c7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
fde7f4a25c am: 1af0bef572 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19981131
Change-Id: Iae6dd2049b3d3131feb1699ab7982f3f00b3eef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 2a4acca2b1 -s ours
am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 fde7f4a25c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/19980641
Change-Id: Ibf1ca9050784efa1c2910db3cc2e9ba88d999903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|