filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
979 Commits 1 Branch 0 Tags
f71e9d856972f0e4f72372c8f1f2b5d4eea784bc
Commit Graph
56 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li 3b5339efa1 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours am: 8f571212fa -s ours am: 8cb54ae1f1 -s ours am: 13a6b68aa8 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: If6d8cfa5a3329f2c110dcdc17cdc299d0c756656
 2020-06-08 17:25:13 +00:00
Xin Li 13a6b68aa8 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours am: 8f571212fa -s ours am: 8cb54ae1f1 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I0bb8e5c145c4cac7fc72384bec31df618cd2622e
 2020-06-08 16:42:09 +00:00
Xin Li 8cb54ae1f1 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours am: 8f571212fa -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I03cc090b70a60c424fe148aa3d64e3e30b345f78
 2020-06-08 16:29:26 +00:00
Xin Li 8f571212fa [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I7119b174b8fa106506e689315e0ccbc71551f266
 2020-06-08 16:08:08 +00:00
Xin Li fffdde5087 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I1c87c70a6e4df7803ca0b8e310c7221fe35b1fbc
 2020-06-08 15:56:53 +00:00
Xin Li c66d3e6e32 Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:24 +00:00
Xin Li 0580b4ade0 Merge QQ3A.200605.002 into master 
Bug: 158095402
Merged-In: Ie293c1c84489e4a1f20972bc056f6d2af67b79b4
Change-Id: If9e62cf4c65cd4d4e029989f23b136c8f5efc7ae
 2020-06-03 10:45:08 -07:00
Xin Li 33aeb03d35 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours am: 67be3bbf79 am: c95b779f7a am: 1c998c5bd3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia1fdf90e81e9e696c9e3aa5abb3a2d349b492108
 2020-04-10 04:29:54 +00:00
Xin Li 1c998c5bd3 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours am: 67be3bbf79 am: c95b779f7a 
Change-Id: I2abe8d47be19b06b1ce2d840c32d19c6024ced94
 2020-04-10 04:05:32 +00:00
Xin Li c95b779f7a [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours am: 67be3bbf79 
Change-Id: I26441f37fa59432f457f7b7baa41985fbc3080f5
 2020-04-10 03:39:14 +00:00
Xin Li 67be3bbf79 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours 
am skip reason: subject contains skip directive

Change-Id: I90519048d9c855d8828ac647544d2653d345cbf6
 2020-04-10 03:06:10 +00:00
Xin Li 85eaa3e1ec DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master 
Bug: 151763422
Change-Id: Ic576a0fc228b600ee5865f70ec431c234d331786
 2020-04-09 17:51:16 -07:00
Xin Li e6711d3686 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 4c26c52ea3 -s ours am: 8948253343 am: 1dc1ed07ae am: d0bc700706 -s ours 
am skip reason: subject contains skip directive

Change-Id: I28bb34241f52cec0e7977475328266401d1d0dd2
 2020-03-20 23:24:40 +00:00
Xin Li d0bc700706 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 4c26c52ea3 -s ours am: 8948253343 am: 1dc1ed07ae 
Change-Id: I34c9d68839d90d697c4aa8b2ccb1fb61dd977bbe
 2020-03-20 22:33:46 +00:00
Xin Li 1dc1ed07ae [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 4c26c52ea3 -s ours am: 8948253343 
Change-Id: Ia9e6c900e5312e3d86e5656d38b94bb59ea58735
 2020-03-20 18:45:28 +00:00
Xin Li fdb989c500 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 4c26c52ea3 
Change-Id: I09310079f719993fbd02eb011db6ccdd6b3081a5
 2020-03-20 18:32:34 +00:00
Xin Li 8948253343 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 4c26c52ea3 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9c99d7bda402e893fa10c9154c9b2e134cab33d8
 2020-03-20 18:32:03 +00:00
Xin Li 4c26c52ea3 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master 
Bug: 151763422
Change-Id: I85f7f3d115fc1eb76c9f898fcf209a54a0d61e58
 2020-03-19 10:10:41 -07:00
Xin Li 9133660c61 [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 8f27830d2d 
am: 8ef613866d -s ours
am skip reason: subject contains skip directive

Change-Id: I3f207781147ba18feaf27c7063b7762f6c7873c7
 2019-10-30 16:02:53 -07:00
Xin Li 8ef613866d DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
am: 8f27830d2d

Change-Id: I5f62246a1864f7ca2fddd92276a0e64d9d689cbb
 2019-10-30 15:36:50 -07:00
Xin Li 8f27830d2d DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: If59160cc7c40fde5577b2aa82feb041c0086e8cf
 2019-10-30 11:49:53 -07:00
Xin Li 5a64e7c27f [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d69430249d -s ours am: e5eb582943 -s ours 
am: a761701291 -s ours
am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1 105542679f is in history

Change-Id: If1cfa0bc72c908eb090d0f3e0dc064b5f5435429
 2019-09-11 11:11:07 -07:00
Xin Li a761701291 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d69430249d -s ours 
am: e5eb582943 -s ours
am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1 105542679f is in history

Change-Id: Ie6f217bd119e850ce3d34ab9829f3a686e48259b
 2019-09-08 15:26:42 -07:00
Xin Li e5eb582943 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
am: d69430249d -s ours
am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1 105542679f is in history

Change-Id: Ic45c1b4f5797f751986f2e6654738c9e778209cc
 2019-09-08 14:43:58 -07:00
Xin Li d69430249d Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
No content change.

Bug: 135460123
Change-Id: I5e64e969936dbbae86d0d71cbad524fb24973af1
Merged-In: I7624257e4cffc690f0df4c844b23cd2accddca4b
 2019-09-08 12:45:15 -07:00
Xin Li 1162710eef [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 105542679f -s ours am: 2f8008876a am: 0e1562408a 
am: 025b5c8ef0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdcc1a85dc133e139f89bd30063442204466b168
 2019-09-05 14:15:44 -07:00
Xin Li 025b5c8ef0 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 105542679f -s ours am: 2f8008876a 
am: 0e1562408a

Change-Id: Ieda91c49c2f3ec3fde2a6b180b7c38f8bea149f0
 2019-09-05 13:35:28 -07:00
Xin Li 0e1562408a [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 105542679f -s ours 
am: 2f8008876a

Change-Id: I0f96f85edfe4bf6aa3a62a2267e27eb66fd5ce6d
 2019-09-05 12:59:18 -07:00
Xin Li 2f8008876a [automerger skipped] DO NOT MERGE - Merge Android 10 into master 
am: 105542679f -s ours
am skip reason: subject contains skip directive

Change-Id: I04b43539e52eae8fd96dc98f36a202c3584d29f4
 2019-09-05 12:13:27 -07:00
Xin Li 105542679f DO NOT MERGE - Merge Android 10 into master 
Bug: 139893257
Change-Id: I7624257e4cffc690f0df4c844b23cd2accddca4b
 2019-09-04 13:34:31 -07:00
Xin Li c7999edb85 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: e051816567 -s ours am: 893d1265ad am: 9e95d7a4f7 
am: bcf3a7354c -s ours
am skip reason: subject contains skip directive

Change-Id: Id68b61cd5e0dc871f0bb3d011c9182c4550a8ec1
 2019-08-14 15:36:07 -07:00
Xin Li bcf3a7354c [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: e051816567 -s ours am: 893d1265ad 
am: 9e95d7a4f7

Change-Id: I7c76f6787472d06f624570d9ae172928389dec23
 2019-08-14 14:23:26 -07:00
Xin Li 9e95d7a4f7 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: e051816567 -s ours 
am: 893d1265ad

Change-Id: I9d7d07738190030ebfde126ca3a6a531feafa144
 2019-08-14 13:56:47 -07:00
Xin Li 893d1265ad [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master 
am: e051816567 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib8d5be333c2d3f87580ed909e5d9a19bb671d44a
 2019-08-14 13:32:01 -07:00
Xin Li e051816567 DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master 
Bug: 134405016
Change-Id: Ib7d990ceba3732de79765f7edf9d27111cbe4bab
 2019-08-14 11:35:20 -07:00
Xin Li 5901937596 [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 336a8d81ab 
am: 97041a8763 -s ours
am skip reason: subject contains skip directive

Change-Id: I33b0b697a9a967a1397ceefc225c5cf28f7931a4
 2019-07-02 16:20:08 -07:00
Xin Li 97041a8763 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
am: 336a8d81ab

Change-Id: Ic9fe362b86f30ccaa936b64335d65c5fe859c9bf
 2019-07-02 13:32:16 -07:00
Xin Li 336a8d81ab DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
Bug: 134405016
Change-Id: I973d953e4c10365e594ddd68516bdc4d7dd0de1c
 2019-07-01 21:00:01 +00:00
Xin Li ed868b5ad0 Merge stage-aosp-master into pi-dev-plus-aosp 
am: aed6ac8955

Change-Id: Ibbbe228273b79a7bdef6f998bda20f19a948ac86
 2019-02-25 01:30:16 -08:00
Xin Li aed6ac8955 Merge stage-aosp-master into pi-dev-plus-aosp 
Bug: 126125118
Change-Id: I431c3fa628a21e2a3ea8fa4e071fe543e7c33f5b
 2019-02-25 00:31:02 -08:00
Xin Li bb9b93a2a6 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master 
Bug: 120848293
Change-Id: I1fbc854ec297abc3f113f2650567f27de8623d73
 2019-02-20 16:19:39 -08:00
Xin Li a02c895f25 [automerger skipped] DO NOT MERGE am: c020ac4b78 -s ours am: ae78a1a65e -s ours 
am: f531c6dc79  -s ours

Change-Id: I4d229684c5124f2ec6fda10e983b5580ea2dad56
 2018-12-10 12:57:03 -08:00
Xin Li f531c6dc79 [automerger skipped] DO NOT MERGE am: c020ac4b78 -s ours 
am: ae78a1a65e  -s ours

Change-Id: I89fb7af89188f9d046e082a998f0c69875de283a
 2018-12-10 11:13:17 -08:00
Xin Li ae78a1a65e [automerger skipped] DO NOT MERGE 
am: c020ac4b78  -s ours

Change-Id: I0e13b090f2aa21482afcf798333e20441fae0873
 2018-12-10 10:10:14 -08:00
Xin Li c020ac4b78 DO NOT MERGE 
Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Id931c19bd78c83aa24c821f12691f92925fdafbe
 2018-12-07 16:14:49 -08:00
Xin Li 4961a80798 Merge Android Pie into master am: 35e712c85b am: e6fe1592b3 am: 8b483ba642 
am: 22810c53b8

Change-Id: I4af54b325165e312d0f3e9b5a871f695b756a92d
 2018-08-08 03:37:43 -07:00
Xin Li 22810c53b8 Merge Android Pie into master am: 35e712c85b am: e6fe1592b3 
am: 8b483ba642

Change-Id: Ibe891fee7857c9e771291e2fa0ff45f8c8f3ea38
 2018-08-07 22:48:49 -07:00
Xin Li 8b483ba642 Merge Android Pie into master am: 35e712c85b 
am: e6fe1592b3

Change-Id: Ic03ccbe728a5251e5f6947c6b3fe04cb3f29f094
 2018-08-07 18:32:11 -07:00
Xin Li e6fe1592b3 Merge Android Pie into master 
am: 35e712c85b

Change-Id: I0b3e50462003eb0c0ea77059b3e671812b9a447e
 2018-08-07 15:01:25 -07:00
Xin Li 35e712c85b Merge Android Pie into master 
Bug: 112104996
Change-Id: Ia50af15c2dbe544047e806de7d0ecff91385bf2c
 2018-08-06 16:51:20 -07:00
Xin Li bdedf3439c Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 268d3c8ccc 
am: 8fb99c8d81

Change-Id: I2d9ff9702b6e0568750d774dd08f4f6a134f75bb
 2018-06-09 06:47:44 -07:00
Xin Li 8fb99c8d81 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 
am: 268d3c8ccc

Change-Id: I9783d2c9fa432af7d528727e7fed215cb1cee4dd
 2018-06-09 03:18:04 -07:00
Xin Li 268d3c8ccc Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 
Bug: 79597307
Change-Id: Ie77e61094c5a4ec4c46c88e5d9659baab61dfd8b
 2018-06-08 11:08:01 -07:00
Xin Li 6337883a56 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 
am: cd9ba9e128

Change-Id: I1d26b974d483b727ff1f023838cd3ac121ffa86c
 2017-11-15 02:36:20 +00:00
Xin Li cd9ba9e128 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 
Change-Id: Ieafa1d7163c3b586f9daa34a8b8239ea57db6636
 2017-11-14 16:38:23 -08:00
Xin Li 8f6c644d6f Merge commit 'b2dd6a8ef54b233843b463204ec4e3b67148a7e8' into HEAD 
Change-Id: Id7e29d1428552414abd16ac7cd17d86b51e61658
 2017-11-13 14:35:43 -08:00