Commit Graph

537426 Commits

Author SHA1 Message Date
TreeHugger Robot
60732f4b24 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours am: c1be178eb1 -s ours am: 1f77568e1b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843401

Change-Id: Id669e6c2c4ac27a36b28b0b0a54360474a64c14f
2020-06-12 06:01:53 +00:00
TreeHugger Robot
1f77568e1b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours am: c1be178eb1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843401

Change-Id: Ia4fa83fd22c85965f40f31ac07b5e1713cac7025
2020-06-12 05:47:14 +00:00
TreeHugger Robot
c1be178eb1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843401

Change-Id: Ic1a1daefd56d2e1da003a0257e7207009f15da7d
2020-06-12 05:30:51 +00:00
Chalard Jean
c0a78ffffc [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 am: 0a36671223 -s ours am: 69d76569dd -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 081ff7a8f2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: I3df529b7edc3a09065962a81fe12cbff11f7a980
2020-06-12 05:27:24 +00:00
Frank Li
e59b548464 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: dc78c3ba8e am: 8440b3c208
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I4a78256de29c566503941be278a0a95d6205fd2c
2020-06-12 05:27:07 +00:00
Chalard Jean
1bd5ff7ed0 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 -s ours am: e6527eef99 -s ours am: 6a8dc3be59 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 081ff7a8f2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: I0d48248896a5877afa23566ff28bba39cee8b473
2020-06-12 05:26:56 +00:00
Frank Li
090d7f22a2 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: f572adce1e am: 84d08f23d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Id077df5a3008addf1990f80eaecd388404edc72d
2020-06-12 05:26:38 +00:00
Automerger Merge Worker
cf1f708158 Merge "Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca" into rvc-d1-dev-plus-aosp am: b3bf6c02a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Ib427a3a94e9f2a706c75902046d1e880912fdfe4
2020-06-12 05:26:25 +00:00
Chalard Jean
7486f777da [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 am: 0a36671223 am: ed78b8532d -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 c022b0c7ea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: Ia5760dd31d1c8b9c1e3ee4b367c51c0521c33e63
2020-06-12 05:25:51 +00:00
Automerger Merge Worker
dbea93fa5a Merge "Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 7dda5946b7 am: 177e3d8fe5" into rvc-qpr-dev-plus-aosp 2020-06-12 05:25:44 +00:00
TreeHugger Robot
5553fe4364 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 7dda5946b7 am: 177e3d8fe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Ia48de3c232db973638d2afe1018c30ae90f48b1a
2020-06-12 05:25:29 +00:00
Frank Li
e768bd457e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: dc78c3ba8e am: 8cb12b28a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I0cc976b95cbcdf2863d40464761111800afa9bc4
2020-06-12 05:25:26 +00:00
TreeHugger Robot
6dbec21e28 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca am: a9e2502c8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I9edab0977a47de42d7a83fd9c680e54ca018c8c4
2020-06-12 05:25:11 +00:00
TreeHugger Robot
7eb6cf298f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-12 05:17:01 +00:00
Chalard Jean
69d76569dd [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 am: 0a36671223 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 081ff7a8f2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: I7194a4a3a70f93dd510bda107f620e23fb0af19d
2020-06-12 05:12:16 +00:00
Frank Li
8440b3c208 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: dc78c3ba8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I56e4f097c02350d411c6d844f3934cfcd7f73ad6
2020-06-12 05:11:40 +00:00
Chalard Jean
6a8dc3be59 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 -s ours am: e6527eef99 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 c022b0c7ea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: I51aaef47a6e94d53a744b80fc684cd6fda6ec73c
2020-06-12 05:11:29 +00:00
Chalard Jean
ed78b8532d Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 am: 0a36671223
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: Idb07331a34e816c0b7f79573d3edb89abd3762ed
2020-06-12 05:11:26 +00:00
Frank Li
84d08f23d0 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: f572adce1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Iea400b5d0716f12f91d5e0ceafa1cde772daf939
2020-06-12 05:11:13 +00:00
Frank Li
8cb12b28a6 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: dc78c3ba8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Ibe0825787e335e0d5b9dae8087523f750c8e2112
2020-06-12 05:11:11 +00:00
Automerger Merge Worker
b3bf6c02a8 Merge "Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca" into rvc-d1-dev-plus-aosp 2020-06-12 05:11:08 +00:00
TreeHugger Robot
177e3d8fe5 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 7dda5946b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I3fcdfe19ba9b2b51e16a013432ef634a446dabe7
2020-06-12 05:10:56 +00:00
TreeHugger Robot
c7f3db371d Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I37fb271e9e780bff7ebc754a3f9e025f25575a18
2020-06-12 05:10:55 +00:00
TreeHugger Robot
a9e2502c8c Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Ie78c3aee8916f5e1c3e7619c4b8cd91e3e0d0373
2020-06-12 05:10:54 +00:00
Automerger Merge Worker
b67569ee8e Merge "Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79" into rvc-d1-dev-plus-aosp am: c490a815c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I194c9ee4b0d544aaf04857015ee7780fbe5178bf
2020-06-12 04:58:39 +00:00
Chalard Jean
e6527eef99 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 -s ours
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 c022b0c7ea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: I819ea5e14c6eaf108ac7252768014aa5d33891b3
2020-06-12 04:58:29 +00:00
Chalard Jean
0a36671223 Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: Ic82a23e6f949bd2c74c3dc49da516938f0603e2e
2020-06-12 04:58:27 +00:00
Frank Li
dc78c3ba8e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Ibb7aa50863308e4364c16701d15f76c47725e707
2020-06-12 04:58:05 +00:00
Frank Li
f572adce1e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I4b789b7c68ede5dd6d73cb5b1c4030855d49940f
2020-06-12 04:58:01 +00:00
Ruchir Rastogi
23319a29b8 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297 am: deb5941c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I3abf9f929f91189dfb78375aacfb6cb5932a2204
2020-06-12 04:57:50 +00:00
TreeHugger Robot
7dda5946b7 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Id560b7d80d6e7130e4bc9828421305c0a7fd45db
2020-06-12 04:57:34 +00:00
TreeHugger Robot
89a5c51eca Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I3e8d0b9de32c121e2c9a68306f14dea97e8628d3
2020-06-12 04:57:31 +00:00
Chalard Jean
8aafdcc328 Merge "Document the limitation to a hundred callbacks." into rvc-dev 2020-06-12 04:54:02 +00:00
Ruchir Rastogi
78f4bb2fea Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297 am: 09495218fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: Icdeef51b41a4d1f25d9cc835903e025aa02114f6
2020-06-12 04:53:21 +00:00
Frank Li
64a3cb03e7 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev 2020-06-12 04:50:57 +00:00
TreeHugger Robot
70bec8cc36 Merge "Help reduce falsing on the seek bar" into rvc-dev 2020-06-12 04:44:55 +00:00
Automerger Merge Worker
c490a815c2 Merge "Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79" into rvc-d1-dev-plus-aosp 2020-06-12 04:42:41 +00:00
Ruchir Rastogi
6cc5dca172 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I65ec2f8a807a74af1af1738b4b3a226290a30caa
2020-06-12 04:42:33 +00:00
Ruchir Rastogi
deb5941c88 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I525b245d12ae4e29c2d70264b437f3b6c826d5ef
2020-06-12 04:42:23 +00:00
Ruchir Rastogi
09495218fc Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: If6708759480aa14a7ff5d381d1f89c965ba0eee9
2020-06-12 04:42:19 +00:00
Automerger Merge Worker
44103695cb Merge "Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: bcd7297083 am: 484684091e" into rvc-qpr-dev-plus-aosp 2020-06-12 04:26:12 +00:00
Automerger Merge Worker
7cd5d622fd Merge "Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6 am: 7a12114217" into rvc-qpr-dev-plus-aosp 2020-06-12 04:26:00 +00:00
Beth Thibodeau
06fa961dd8 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: bcd7297083 am: 484684091e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I6862c18a0d2bbe7c4304edc059a7dd0413094a7c
2020-06-12 04:25:59 +00:00
Ruchir Rastogi
49efb08d79 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: Ibb041b389a8f2ce24f351c46bbe9500b877aeaf7
2020-06-12 04:25:53 +00:00
Beth Thibodeau
42a897949e Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6 am: 7a12114217
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: Ib837ffa68b147d3e4f352e561f98c7f58fb83217
2020-06-12 04:25:44 +00:00
Ruchir Rastogi
40c4fad297 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I0eae405855a39047d0fa315c26e0831d8f613161
2020-06-12 04:25:39 +00:00
Beth Thibodeau
25995f3e00 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6 am: 10288035a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I2366e8eead9f2ae268e90784d46b5240b1108301
2020-06-12 04:25:35 +00:00
Ruchir Rastogi
003ef4903a Merge "Add libincident_test to MTS" into rvc-dev 2020-06-12 04:11:44 +00:00
Beth Thibodeau
484684091e Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: bcd7297083
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I66b51251b3612e76329fc0f943630d4a6ab90e7f
2020-06-12 04:02:51 +00:00
Beth Thibodeau
7a12114217 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I8136048af682c7d469b945042f122a0adae788e5
2020-06-12 04:02:31 +00:00