Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 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 Xin Li 2019-08-14 15:36:07 -07:00
• 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 Xin Li 2019-08-14 14:23:26 -07:00
• 9e95d7a4f7 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: e051816567 -s ours am: 893d1265ad Xin Li 2019-08-14 13:56:47 -07:00
• 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 Xin Li 2019-08-14 13:32:01 -07:00
• e051816567 DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master Xin Li 2019-08-14 11:35:20 -07:00
• 854de7a353 Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 am: 363ee13c86 am: cc99cd75de am: c628d93012 am: 89fe3e18f2 Taesu Lee 2019-08-13 22:54:13 -07:00
• 89fe3e18f2 Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 am: 363ee13c86 am: cc99cd75de am: c628d93012 Taesu Lee 2019-08-13 22:42:49 -07:00
• c628d93012 Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 am: 363ee13c86 am: cc99cd75de Taesu Lee 2019-08-13 22:31:55 -07:00
• cc99cd75de Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 am: 363ee13c86 Taesu Lee 2019-08-13 22:21:20 -07:00
• 363ee13c86 Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" am: 05f6de16d3 Taesu Lee 2019-08-13 22:10:26 -07:00
• 05f6de16d3 Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity" Treehugger Robot 2019-08-14 04:19:19 +00:00
• 1e619f09c6 Merge "Move Messaging to /product" am: 4fa5f17013 am: 5106de587b am: 2062b1bf71 am: c5a20b7b90 am: 9b12d48c20 Po-Chien Hsueh 2019-08-13 19:13:36 -07:00
• 9b12d48c20 Merge "Move Messaging to /product" am: 4fa5f17013 am: 5106de587b am: 2062b1bf71 am: c5a20b7b90 Po-Chien Hsueh 2019-08-13 19:01:08 -07:00
• c5a20b7b90 Merge "Move Messaging to /product" am: 4fa5f17013 am: 5106de587b am: 2062b1bf71 Po-Chien Hsueh 2019-08-13 18:48:37 -07:00
• 2062b1bf71 Merge "Move Messaging to /product" am: 4fa5f17013 am: 5106de587b Po-Chien Hsueh 2019-08-13 18:37:11 -07:00
• 5106de587b Merge "Move Messaging to /product" am: 4fa5f17013 Po-Chien Hsueh 2019-08-13 18:23:40 -07:00
• 4fa5f17013 Merge "Move Messaging to /product" Po-Chien Hsueh 2019-08-14 00:35:31 +00:00
• 8e173329e0 Move Messaging to /product Po-Chien Hsueh 2019-08-13 16:48:24 +08:00
• 2b7516e5a0 Fix FATAL EXCEPTION on SmsStorageLowWarningActivity Taesu Lee 2015-11-16 14:14:46 +09:00
• 6312e723a3 Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 am: 8ad8631f0c am: 3c713cc25d am: 4cf93a099b am: a78cfd1a47 Taesu Lee 2019-08-12 13:50:14 -07:00
• a78cfd1a47 Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 am: 8ad8631f0c am: 3c713cc25d am: 4cf93a099b Taesu Lee 2019-08-12 13:40:13 -07:00
• 4cf93a099b Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 am: 8ad8631f0c am: 3c713cc25d Taesu Lee 2019-08-12 13:30:13 -07:00
• 3c713cc25d Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 am: 8ad8631f0c Taesu Lee 2019-08-12 13:20:08 -07:00
• 8ad8631f0c Merge "Sort ParticipantsData in order of the slot id" am: 00228481c9 Taesu Lee 2019-08-12 13:10:07 -07:00
• 00228481c9 Merge "Sort ParticipantsData in order of the slot id" Treehugger Robot 2019-08-12 19:40:44 +00:00
• bd41aeab6e Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f am: 6da2bf2c03 am: 30172868d0 am: 12b4028bb2 am: 01ac9dc579 Taesu Lee 2019-08-02 16:58:50 -07:00
• 01ac9dc579 Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f am: 6da2bf2c03 am: 30172868d0 am: 12b4028bb2 Taesu Lee 2019-08-02 16:46:40 -07:00
• 12b4028bb2 Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f am: 6da2bf2c03 am: 30172868d0 Taesu Lee 2019-08-02 16:36:24 -07:00
• 30172868d0 Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f am: 6da2bf2c03 Taesu Lee 2019-08-02 16:21:19 -07:00
• 6da2bf2c03 Ignore unexpected ACTION_DOWN for SIM avatar icons am: 7ccc6d1b9f Taesu Lee 2019-08-02 16:09:19 -07:00
• 7ccc6d1b9f Ignore unexpected ACTION_DOWN for SIM avatar icons Taesu Lee 2019-08-02 15:36:45 +09:00
• b22bc643ce Sort ParticipantsData in order of the slot id Taesu Lee 2019-08-01 18:36:04 +09:00
• 4b6fdfa451 Remove --legacy flag Greg Kaiser 2019-07-11 11:26:04 -07:00
• 0106dba207 Import translations. DO NOT MERGE Bill Yi 2019-07-11 13:31:36 -07:00
• 86c15520a1 Import translations. DO NOT MERGE Bill Yi 2019-07-09 15:11:43 -07:00
• 52bd9a2c6b AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1 am: 22744717a7 am: be2b581a14 am: 79843ed39e Raman Tenneti 2019-07-08 19:04:51 -07:00
• 79843ed39e AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1 am: 22744717a7 am: be2b581a14 Raman Tenneti 2019-07-08 18:20:16 -07:00
• be2b581a14 AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1 am: 22744717a7 Raman Tenneti 2019-07-08 18:00:19 -07:00
• 22744717a7 AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1 Raman Tenneti 2019-07-08 17:35:47 -07:00
• a7a1d07ce1 AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. Raman Tenneti 2019-07-08 12:00:42 -07:00
• 507ec13360 Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 am: 22d93c0406 am: 0512d2078e am: b06eb3a0d3 Taesu Lee 2019-07-03 19:05:06 -07:00
• b06eb3a0d3 Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 am: 22d93c0406 am: 0512d2078e Taesu Lee 2019-07-03 17:23:04 -07:00
• 0512d2078e Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 am: 22d93c0406 Taesu Lee 2019-07-03 16:35:23 -07:00
• 22d93c0406 Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 Taesu Lee 2019-07-03 16:23:10 -07:00
• b7f93e6f10 Merge "Replace no error code '0' for SMS with '-1'" Treehugger Robot 2019-07-03 18:08:28 +00:00
• 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 Xin Li 2019-07-02 16:20:08 -07:00
• 97041a8763 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 336a8d81ab Xin Li 2019-07-02 13:32:16 -07:00
• 336a8d81ab DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master Xin Li 2019-07-01 21:00:01 +00:00
• ff2a232770 Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b am: 443ef0243d am: 570199e8ab am: e5bf830ea2 Colin Cross 2019-06-27 11:26:44 -07:00
• e5bf830ea2 Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b am: 443ef0243d am: 570199e8ab Colin Cross 2019-06-26 12:34:18 -07:00
• 570199e8ab Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b am: 443ef0243d Colin Cross 2019-06-26 11:42:10 -07:00
• 443ef0243d Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b Colin Cross 2019-06-26 11:06:18 -07:00
• db0b50238b Merge "Pass --legacy to aapt2 compile for Messaging" Colin Cross 2019-06-26 17:05:33 +00:00
• 5d437c17a7 Fix GetOrCreateConversationActionTest failure am: a019a9da5c am: 3616fb5b3e am: b95a19ca46 am: e4e98a1f7c Taesu Lee 2019-06-25 16:11:11 -07:00
• e4e98a1f7c Fix GetOrCreateConversationActionTest failure am: a019a9da5c am: 3616fb5b3e am: b95a19ca46 Taesu Lee 2019-06-25 15:54:02 -07:00
• b95a19ca46 Fix GetOrCreateConversationActionTest failure am: a019a9da5c am: 3616fb5b3e Taesu Lee 2019-06-25 15:18:38 -07:00
• 3616fb5b3e Fix GetOrCreateConversationActionTest failure am: a019a9da5c Taesu Lee 2019-06-25 14:51:55 -07:00
• a019a9da5c Fix GetOrCreateConversationActionTest failure Taesu Lee 2019-06-25 14:25:51 +09:00
• da8b67be0c Replace no error code '0' for SMS with '-1' Taesu Lee 2017-02-08 14:43:18 +09:00
• 315a07d50e Merge "Fix assertion failures caused by different instance type" am: 5500d33555 am: f390d17b40 am: 8ded71f805 am: f05af1e2a8 Taesu Lee 2019-06-21 15:56:04 -07:00
• 80f974e73e Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 am: eb4206aea1 am: f9b474c443 am: 77ddd2dcbe Taesu Lee 2019-06-21 15:55:29 -07:00
• f05af1e2a8 Merge "Fix assertion failures caused by different instance type" am: 5500d33555 am: f390d17b40 am: 8ded71f805 Taesu Lee 2019-06-21 15:53:22 -07:00
• 77ddd2dcbe Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 am: eb4206aea1 am: f9b474c443 Taesu Lee 2019-06-21 15:52:33 -07:00
• 8ded71f805 Merge "Fix assertion failures caused by different instance type" am: 5500d33555 am: f390d17b40 Taesu Lee 2019-06-21 15:41:00 -07:00
• f9b474c443 Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 am: eb4206aea1 Taesu Lee 2019-06-21 15:40:22 -07:00
• f390d17b40 Merge "Fix assertion failures caused by different instance type" am: 5500d33555 Taesu Lee 2019-06-21 15:34:11 -07:00
• eb4206aea1 Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 Taesu Lee 2019-06-21 15:33:25 -07:00
• 5500d33555 Merge "Fix assertion failures caused by different instance type" Treehugger Robot 2019-06-21 22:21:40 +00:00
• 0e3986db52 Merge "Fix MMS Config issues in Debug menu" Treehugger Robot 2019-06-21 22:09:41 +00:00
• f2febe62af Apply new duplication detection logic for M-Notification.ind am: 77a839f1ef am: cf5dcfef5a am: a22a68f41f am: b914b9a1ec Taesu Lee 2019-06-21 12:33:34 -07:00
• b914b9a1ec Apply new duplication detection logic for M-Notification.ind am: 77a839f1ef am: cf5dcfef5a am: a22a68f41f Taesu Lee 2019-06-21 12:27:38 -07:00
• a22a68f41f Apply new duplication detection logic for M-Notification.ind am: 77a839f1ef am: cf5dcfef5a Taesu Lee 2019-06-21 12:22:24 -07:00
• cf5dcfef5a Apply new duplication detection logic for M-Notification.ind am: 77a839f1ef Taesu Lee 2019-06-21 12:15:22 -07:00
• ef765e414e Pass --legacy to aapt2 compile for Messaging Colin Cross 2019-06-20 16:58:37 -07:00
• 77a839f1ef Apply new duplication detection logic for M-Notification.ind Taesu Lee 2017-01-17 10:18:12 +09:00
• 4b6794a205 Merge "Use correct format info for SMS" am: a6f1ae137d am: 5089da9e20 am: 71e2706105 am: 3d4179e358 Taesu Lee 2019-06-11 19:24:10 -07:00
• 3d4179e358 Merge "Use correct format info for SMS" am: a6f1ae137d am: 5089da9e20 am: 71e2706105 Taesu Lee 2019-06-11 19:16:50 -07:00
• 71e2706105 Merge "Use correct format info for SMS" am: a6f1ae137d am: 5089da9e20 Taesu Lee 2019-06-11 19:14:00 -07:00
• 5089da9e20 Merge "Use correct format info for SMS" am: a6f1ae137d Taesu Lee 2019-06-11 19:04:47 -07:00
• a6f1ae137d Merge "Use correct format info for SMS" Treehugger Robot 2019-06-12 01:38:23 +00:00
• 7e2877c793 Merge "Fix SMS status handling" am: 4e3db63e41 am: 8f649c7078 am: 91e9df451b am: 5c9504ba20 Taesu Lee 2019-06-11 17:49:00 -07:00
• 1856bce196 Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe am: 183d4d6c24 am: a84f2dbad6 am: 87e7583d08 Taesu Lee 2019-06-11 17:48:27 -07:00
• 5c9504ba20 Merge "Fix SMS status handling" am: 4e3db63e41 am: 8f649c7078 am: 91e9df451b Taesu Lee 2019-06-11 17:39:08 -07:00
• 87e7583d08 Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe am: 183d4d6c24 am: a84f2dbad6 Taesu Lee 2019-06-11 17:38:30 -07:00
• 91e9df451b Merge "Fix SMS status handling" am: 4e3db63e41 am: 8f649c7078 Taesu Lee 2019-06-11 17:33:16 -07:00
• a84f2dbad6 Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe am: 183d4d6c24 Taesu Lee 2019-06-11 17:32:27 -07:00
• 8f649c7078 Merge "Fix SMS status handling" am: 4e3db63e41 Taesu Lee 2019-06-11 17:23:51 -07:00
• 183d4d6c24 Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe Taesu Lee 2019-06-11 17:23:23 -07:00
• 4e3db63e41 Merge "Fix SMS status handling" Treehugger Robot 2019-06-12 00:18:44 +00:00
• aa5bde8dbe Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" Treehugger Robot 2019-06-12 00:12:16 +00:00
• b6dc76e4ec Fix wrong PreferenceCategory for SMS delivery report am: 6c3770a7ea am: 96f3365b99 am: 429fa7382f am: ceaade33fd Taesu Lee 2019-06-11 16:34:17 -07:00
• ceaade33fd Fix wrong PreferenceCategory for SMS delivery report am: 6c3770a7ea am: 96f3365b99 am: 429fa7382f Taesu Lee 2019-06-11 16:19:53 -07:00
• 429fa7382f Fix wrong PreferenceCategory for SMS delivery report am: 6c3770a7ea am: 96f3365b99 Taesu Lee 2019-06-11 16:08:48 -07:00
• 96f3365b99 Fix wrong PreferenceCategory for SMS delivery report am: 6c3770a7ea Taesu Lee 2019-06-11 16:03:46 -07:00
• 6c3770a7ea Fix wrong PreferenceCategory for SMS delivery report Taesu Lee 2018-04-04 10:25:18 +09:00
• 2771ac7ae9 Fix assertion failures caused by different instance type Taesu Lee 2018-04-03 16:25:07 +09:00
• 4ef18dead7 Merge "Messaging: Fix generating id in android namespace" am: 1e56062ac9 am: d6b0b845ee am: 2084ce2d5d am: 53c1f09d06 Raman Tenneti 2019-05-24 02:33:41 -07:00
• 53c1f09d06 Merge "Messaging: Fix generating id in android namespace" am: 1e56062ac9 am: d6b0b845ee am: 2084ce2d5d Raman Tenneti 2019-05-23 23:26:58 -07:00
• 2084ce2d5d Merge "Messaging: Fix generating id in android namespace" am: 1e56062ac9 am: d6b0b845ee Raman Tenneti 2019-05-23 22:14:37 -07:00
• d6b0b845ee Merge "Messaging: Fix generating id in android namespace" am: 1e56062ac9 Raman Tenneti 2019-05-23 17:14:12 -07:00