Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
797,537 Commits 3 Branches 0 Tags
aff685658a5888e5ec0f50aa02016b5ce86bd3c2
Commit Graph

797537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
aff685658a Merge changes from topic "am-04b9c25dff264f8f95ac8c6f858a0922" into tm-d1-dev-plus-aosp am: d49c69dc88 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I5006efefa6a549134a7bbcbd78ed1f1d6a3d1634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:26:57 +00:00
Yuri Lin
e607adc2a8 [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 97038106f9 -s ours am: 80b30783e2 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I658dabe359e60b56b1c48cb212220d7959d7c818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:26:46 +00:00
Yuri Lin
29361f95f8 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: ba06923190 -s ours am: 4eab506bf3 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: Idcae2b92949bf6c64948b870a6ea5723e239d87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:26:14 +00:00
Yuri Lin
77f946f63f [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: d9f1803ddf -s ours am: d0df2c33f8 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: If06feda3be04255f148a13b980426e8e80fe0de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:26:04 +00:00
Yuri Lin
2f719a2d15 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: 1769811fee -s ours am: c1d7346b13 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I5ab13740d3132e0636064639799e5cd3c35bd2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:25:35 +00:00
Yuri Lin
0c2f23fb20 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: eb2e362fa7 -s ours am: 19815724ee -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: Id5e8a9f503c29a8ad8ac0dfd8a6dca2f8ffb6218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:25:21 +00:00
Chiachang Wang
7fea2d0524 [automerger skipped] Merge changes from topic "cherrypicker-L19300000956051124:N78200001288956413" into tm-qpr-dev am: 76395aec8b -s ours 
am skip reason: Merged-In I9eed58b2e96ebaf33e557a42e83525a74a4697d8 with SHA-1 5a0ea79c41 is already in history

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

Change-Id: Id5f1ba1847c005e43dcef37ca2704954a060c144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:04:35 +00:00
chiachangwang
75e74c3907 [automerger skipped] Skip events on stale Ikev2VpnRunner am: 704321da7d -s ours 
am skip reason: Merged-In I9eed58b2e96ebaf33e557a42e83525a74a4697d8 with SHA-1 5a0ea79c41 is already in history

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

Change-Id: Id35aa4716cad1ea27a99bbb54aecf290f3561754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:04:23 +00:00
Automerger Merge Worker
9f5d7d38f3 Merge "[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours" into tm-d1-dev am: 34776f6548 -s ours am: beb598ab35 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I8a2cfd9d45bd0a63a4e2e2d30118e3e401428f77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:02:54 +00:00
Yuri Lin
971e400f8a [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: 5c6000d8f1 -s ours am: 0bb80d15a6 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I5f3418f29b2831c8a48e2353eba8a9b119a4cb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:02:28 +00:00
Yuri Lin
88b197ef42 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: f3ad8d4700 -s ours am: 6d226d3708 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I37596eb0f6615164e445d3b27a7eafb89c9bb872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:02:14 +00:00
Yuri Lin
d368f2fbc2 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 20e6d6b0f0 -s ours am: af8ebb3399 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I804f306b2049e963a2010404e64b8ed2bc9ac01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:01:46 +00:00
Yuri Lin
63dd0ec060 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 99555b4371 -s ours am: cfe193e76c -s ours am: dfb1c6133b -s ours am: b67e8bac55 -s ours am: 4852927e11 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I5c3dee010e343ce493199258f33db424bca52de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:01:37 +00:00
Yuri Lin
97ecc2cac9 [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 97038106f9 -s ours am: 82064c0693 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Id236ae66037dd6cf88b94135c163cbf6af20c9c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:01:17 +00:00
Yuri Lin
c91f7bc410 [automerger skipped] [automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559 am: 9ed71acfb1 -s ours am: 472ec1a2b2 -s ours am: 63c3ed7f36 -s ours am: eaf796db63 -s ours am: 16b6fd6efa -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I8d82d2451a60791a1e7b08c3ef693d4b5bb3f5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:00:59 +00:00
Yuri Lin
19d0a9c093 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: 1769811fee -s ours am: 936cef4ef8 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I7dfe824951ecab41c0e89cb774252279ed58af4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:00:04 +00:00
Yuri Lin
8e4aebdc5a [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: eb2e362fa7 -s ours am: c908a49a09 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I9838be94e0800c35a1bd434ef74a5edcc7864624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:59:48 +00:00
Chiachang Wang
76395aec8b Merge changes from topic "cherrypicker-L19300000956051124:N78200001288956413" into tm-qpr-dev 
* changes:
  Skip events on stale Ikev2VpnRunner
  Invert the order of event sending and VpnRunner.exit()
  Stop VPN profiles by exiting VpnRunner instead of prepareInternal
 2022-09-07 00:46:36 +00:00
Automerger Merge Worker
beb598ab35 Merge "[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours" into tm-d1-dev am: 34776f6548 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I7db57e4ef90139f5fe0d4ee8f34cdb2181274d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:46:07 +00:00
Yuri Lin
0bb80d15a6 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: 5c6000d8f1 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I3317cb067396cc0c41b678c8392df7b5c4a03c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:46:05 +00:00
Yuri Lin
6d226d3708 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: f3ad8d4700 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I4abb0d00fd16fcb80ea72b0252e237489c50d07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:44 +00:00
Yuri Lin
af8ebb3399 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours am: 20e6d6b0f0 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I5af4bbd80fe60c40649c4dcedaae1f5250b89f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:37 +00:00
Yuri Lin
4852927e11 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 99555b4371 -s ours am: cfe193e76c -s ours am: dfb1c6133b -s ours am: b67e8bac55 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I44c21ee093c420ff48753c418a50875f45b28709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:35 +00:00
Automerger Merge Worker
d49c69dc88 Merge changes from topic "am-04b9c25dff264f8f95ac8c6f858a0922" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 97038106f9 -s ours
  [automerger skipped] [automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559 am: 9ed71acfb1 -s ours am: 472ec1a2b2 -s ours am: 63c3ed7f36 -s ours am: eaf796db63 -s ours
 2022-09-07 00:45:26 +00:00
Yuri Lin
80b30783e2 [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 97038106f9 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: Id176eb3ae53be6eff428ac06e72436b837aac47b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:11 +00:00
Yuri Lin
82064c0693 [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours am: 97038106f9 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I1cb9cad6e7009b2dbfbaa7acbd91506b146cdd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:10 +00:00
Yuri Lin
16b6fd6efa [automerger skipped] [automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559 am: 9ed71acfb1 -s ours am: 472ec1a2b2 -s ours am: 63c3ed7f36 -s ours am: eaf796db63 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I06783f39c074f742b89b7b7a20472b203dda8e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:08 +00:00
Yuri Lin
4eab506bf3 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: ba06923190 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I0d06c40dd7d3a15e80b606ac1de6d8da0f2fe868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:03 +00:00
Yuri Lin
9d9d943a4c [automerger skipped] [automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559 am: 9ed71acfb1 -s ours am: 472ec1a2b2 -s ours am: 63c3ed7f36 -s ours am: eaf796db63 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I1557d69f7161664ec79f0c8acd12e5c6c58f5477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:45:03 +00:00
Yuri Lin
d0df2c33f8 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: d9f1803ddf -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: Ia8245fb19aa7c9401558086b66878f11cb1aafe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:44:57 +00:00
Yuri Lin
936cef4ef8 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: 1769811fee -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I4df2753c88140266eaa7cd04315cf4704ff3649b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:44:45 +00:00
Yuri Lin
c1d7346b13 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: 1769811fee -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: Ie2f319e494841bc9914d04f5875266d4f46b5328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:44:39 +00:00
Yuri Lin
c908a49a09 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: eb2e362fa7 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I83768917ee0238626081d8cb036ecaf127e9698e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:44:31 +00:00
Yuri Lin
19815724ee [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours am: eb2e362fa7 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I011ac5fcb3fbe9aa8cd4e8f95ca3b50101daccd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:44:26 +00:00
Benno Lin
c8126b8597 Merge "Create test app that mimics GMail" into tm-qpr-dev am: e4be54bdee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19769183

Change-Id: Ia073528855cf84944312cf8634925eab755fb58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:42:29 +00:00
Automerger Merge Worker
34776f6548 Merge "[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours" into tm-d1-dev 2022-09-07 00:19:54 +00:00
Yuri Lin
5c6000d8f1 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: I6fff0361d9d2da331738202083061655c30aa9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:19:50 +00:00
Yuri Lin
0f503a4753 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-dev am: de7b49d170 am: 2e43eaccbb -s ours am: c0fc78ff2c -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I24199b807069664903d3e66154bc4e55ac55acb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:18:47 +00:00
Yuri Lin
f3ad8d4700 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history

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

Change-Id: Ia58bbb1476f3014f8d5b7466c89989e06bdfd743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:18:37 +00:00
Yuri Lin
20e6d6b0f0 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-qpr1-dev am: 0da78aac06 -s ours am: 8de41350c9 -s ours am: ce97650a05 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I9ce707a8d8e8779413cf5e356a0f81f1f760ebd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:18:30 +00:00
Yuri Lin
b67e8bac55 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 99555b4371 -s ours am: cfe193e76c -s ours am: dfb1c6133b -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I50ce5a2f4070b88b3a477abd57f3bcf82028590c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:18:27 +00:00
Yuri Lin
97038106f9 [automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f088a -s ours am: 3981fd411c -s ours am: 9af8170c00 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I9afafc3152aac95770b60dcae56975df6bd97364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:18:07 +00:00
Yuri Lin
eaf796db63 [automerger skipped] [automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559 am: 9ed71acfb1 -s ours am: 472ec1a2b2 -s ours am: 63c3ed7f36 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history

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

Change-Id: I5913420f07be30befc0037fb2a10f4bc5eb9e4db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:18:05 +00:00
Yuri Lin
1769811fee [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I54201a597c69e9049b9bc92b8bc987abad6945c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:17:50 +00:00
Yuri Lin
eb2e362fa7 [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I1daa4bb54ccd72dbdccff0d20b2d5246ad59a80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:17:48 +00:00
Yuri Lin
ebdbf2027e [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-dev am: de7b49d170 am: bb36470dd7 am: e53f8dd450 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I4337966902f43930882cf3da8ca57d71b28c0444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:16:45 +00:00
Benno Lin
e4be54bdee Merge "Create test app that mimics GMail" into tm-qpr-dev 2022-09-07 00:16:18 +00:00
Yuri Lin
ba06923190 [automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I031df1f79dafaaa666bef6f5fddd7a0600c983a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:14:44 +00:00
Yuri Lin
d9f1803ddf [automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 3d8504587c -s ours am: a626a85e00 -s ours 
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history

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

Change-Id: I599ba34b0fa33669b1cb722378487c5bafe93909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:14:32 +00:00
Yuri Lin
0319a4f8c2 Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-dev am: de7b49d170 am: bb36470dd7 am: 1d404511dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816377

Change-Id: Ie94ac10211221eab1f110f923c1e6ac3e94c4fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:00:34 +00:00