Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• dc683fa0fd Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55 am: 8f2f5671b0 Atanas Kirilov 2018-06-01 03:47:45 -07:00
• a3a85140b6 [automerger skipped] [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0 am: 26ae608af3 am: 999910ca54 -s ours David Smith 2018-06-01 03:47:21 -07:00
• 8f2f5671b0 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55 Atanas Kirilov 2018-06-01 00:36:07 -07:00
• 999910ca54 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0 am: 26ae608af3 David Smith 2018-06-01 00:35:46 -07:00
• 24fba8cf55 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 Atanas Kirilov 2018-05-31 20:13:28 -07:00
• 26ae608af3 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0 David Smith 2018-05-31 20:13:01 -07:00
• f7bdc8fd87 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev Atanas Kirilov 2018-06-01 00:19:17 +00:00
• 7459ff44a0 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 Android Build Merger (Role) 2018-05-25 23:49:56 +00:00
• 69535177c6 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 Android Build Merger (Role) 2018-05-25 23:49:56 +00:00
• 4ef3ac9534 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb Android Build Merger (Role) 2018-05-25 23:49:55 +00:00
• 7ad8e75fdb [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 Android Build Merger (Role) 2018-05-25 23:49:54 +00:00
• 4fc4f4e215 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c Android Build Merger (Role) 2018-05-25 23:49:53 +00:00
• f53801c86c [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 Android Build Merger (Role) 2018-05-25 23:49:52 +00:00
• 520012db02 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 Android Build Merger (Role) 2018-05-25 23:49:51 +00:00
• b40c396122 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce Android Build Merger (Role) 2018-05-25 23:49:50 +00:00
• a04af950ce [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b Android Build Merger (Role) 2018-05-25 23:49:49 +00:00
• 0ee4c0e33b RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent David Smith 2018-05-01 14:54:46 -07:00
• 870a173e43 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 am: 0c21193863 Android Build Merger (Role) 2018-05-25 23:24:07 +00:00
• 0c21193863 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 Android Build Merger (Role) 2018-05-25 23:24:06 +00:00
• 9c69271a58 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 Android Build Merger (Role) 2018-05-25 23:24:05 +00:00
• cd77076596 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 Android Build Merger (Role) 2018-05-25 23:24:04 +00:00
• ea03db3303 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 Android Build Merger (Role) 2018-05-25 23:24:03 +00:00
• 9deefdf182 Messaging ignores file URIs shared via intent David Smith 2018-05-01 14:54:46 -07:00
• 0a365bf7cf Merge "Fix 'date' so that it does not cause regeneration for unbundled builds" TreeHugger Robot 2018-05-15 20:19:28 +00:00
• 5b52455e8f [automerger skipped] Migrate messaging to aapt2. am: a75d7022fc am: d037073df0 -s ours am: c6bbabd464 -s ours Aurimas Liutikas 2018-05-07 14:24:55 -07:00
• c6bbabd464 [automerger skipped] Migrate messaging to aapt2. am: a75d7022fc am: d037073df0 -s ours Aurimas Liutikas 2018-05-07 13:34:51 -07:00
• d037073df0 Migrate messaging to aapt2. am: a75d7022fc Aurimas Liutikas 2018-05-07 12:32:04 -07:00
• a75d7022fc Migrate messaging to aapt2. Aurimas Liutikas 2017-11-21 12:50:18 -08:00
• f38a1bdc3c Migrate Messaging to androidx. Aurimas Liutikas 2018-04-09 17:17:41 -07:00
• 058a0cb454 Fix 'date' so that it does not cause regeneration for unbundled builds Zach Riggle 2018-03-15 16:39:52 -05:00
• 7e3b13bac4 Snap for 4628106 from 737093efd3 to pi-release android-build-team Robot 2018-03-01 08:27:18 +00:00
• 49d1460b97 putback go/ag/3671714. Vasu Nori 2018-02-28 16:25:02 -08:00
• 737093efd3 Merge "Revert "Enable content observer notifications even for default SMS app, when the"" Vasu Nori 2018-02-28 19:43:34 +00:00
• 871938aa2c Revert "Enable content observer notifications even for default SMS app, when the" Vasu Nori 2018-02-28 17:34:49 +00:00
• d55337e178 Snap for 4620899 from 4c9320a8e4 to pi-release android-build-team Robot 2018-02-25 08:23:00 +00:00
• 4c9320a8e4 Merge "Enable content observer notifications even for default SMS app, when the build is for Android Auto" Vasu Nori 2018-02-23 23:02:18 +00:00
• 9b36178728 Snap for 4615953 from b6e11d33bb to pi-release android-build-team Robot 2018-02-22 08:27:07 +00:00
• b6e11d33bb Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99 am: 38dea40340 am: 9b793ee396 Nan Zhang 2018-02-22 02:36:45 +00:00
• 9b793ee396 Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99 am: 38dea40340 Nan Zhang 2018-02-22 02:29:34 +00:00
• 38dea40340 Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99 Nan Zhang 2018-02-22 02:21:28 +00:00
• 3dd036dc99 Use HAS_BUILD_NUMBER to check engineering build Nan Zhang 2018-02-20 13:28:22 -08:00
• 2e0bf0af27 Enable content observer notifications even for default SMS app, when the build is for Android Auto Vasu Nori 2018-02-14 15:26:15 -08:00
• ad08ef8705 Snap for 4521654 from f5db1f5e3f to pi-release android-build-team Robot 2017-12-31 08:25:54 +00:00
• f5db1f5e3f Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b am: 2be03391bb am: 11447d4c1a Colin Cross 2017-12-28 19:04:00 +00:00
• 11447d4c1a Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b am: 2be03391bb Colin Cross 2017-12-28 18:55:58 +00:00
• 2be03391bb Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b Colin Cross 2017-12-28 18:46:57 +00:00
• 86e0cae74b Don't use LOCAL_PROGUARD_ENABLED := nosystem Colin Cross 2017-12-27 18:53:41 -08:00
• 739aec86d2 Snap for 4507345 from 85fb9ddccc to pi-release android-build-team Robot 2017-12-17 08:21:33 +00:00
• 85fb9ddccc Merge "Add android.test.base/stubs dependency" TreeHugger Robot 2017-12-15 14:00:38 +00:00
• dab728b9cd Switch to modern ArgumentMatchers am: 13ade30481 am: 4825219c58 am: aac55283be Philip P. Moltmann 2017-12-15 11:37:41 +00:00
• aac55283be Switch to modern ArgumentMatchers am: 13ade30481 am: 4825219c58 Philip P. Moltmann 2017-12-15 11:16:30 +00:00
• 4825219c58 Switch to modern ArgumentMatchers am: 13ade30481 Philip P. Moltmann 2017-12-15 10:55:57 +00:00
• 3a14dd0aa8 Add android.test.base/stubs dependency Paul Duffin 2017-12-15 07:22:38 +00:00
• 13ade30481 Switch to modern ArgumentMatchers Philip P. Moltmann 2017-11-27 12:58:51 -08:00
• 613144092f Snap for 4502278 from f6aa0ff80e to pi-release android-build-team Robot 2017-12-14 08:33:18 +00:00
• f6aa0ff80e Merge "Switch to modern ArgumentMatchers" Philip P. Moltmann 2017-12-13 23:40:20 +00:00
• 2bbefa816b Snap for 4500033 from dc6414be65 to pi-release android-build-team Robot 2017-12-13 08:33:07 +00:00
• dc6414be65 Use a.t.mock.stubs instead of a.t.mock.sdk am: 13c0cbe2c6 am: 79fbe99445 am: f18ac489da -s ours Paul Duffin 2017-12-13 01:57:22 +00:00
• f18ac489da Use a.t.mock.stubs instead of a.t.mock.sdk am: 13c0cbe2c6 am: 79fbe99445 Paul Duffin 2017-12-13 01:43:58 +00:00
• 79fbe99445 Use a.t.mock.stubs instead of a.t.mock.sdk am: 13c0cbe2c6 Paul Duffin 2017-12-13 01:11:53 +00:00
• ea5d77fa38 Switch to modern ArgumentMatchers Philip P. Moltmann 2017-11-27 12:58:51 -08:00
• 13c0cbe2c6 Use a.t.mock.stubs instead of a.t.mock.sdk Paul Duffin 2017-11-16 12:57:30 +00:00
• 559aa3cd3f Snap for 4489599 from 2e86be170a to pi-release android-build-team Robot 2017-12-07 08:21:05 +00:00
• 2e86be170a Flatten dependency hierarchy of legacy-android-test Paul Duffin 2017-12-05 18:36:57 +00:00
• 4b7000782f Snap for 4464948 from 9812a75c01 to pi-release android-build-team Robot 2017-11-22 08:20:59 +00:00
• 9812a75c01 Migrate messaging to aapt2. Aurimas Liutikas 2017-11-21 12:50:18 -08:00
• 29fe83ef12 Snap for 4459973 from ea59fb8c73 to pi-release android-build-team Robot 2017-11-19 08:22:08 +00:00
• ea59fb8c73 Use a.t.mock.stubs instead of a.t.mock.sdk Paul Duffin 2017-11-16 12:57:30 +00:00
• 4f38e34ada Snap for 4453288 from 6337883a56 to pi-release android-build-team Robot 2017-11-15 08:27:46 +00:00
• 6337883a56 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: cd9ba9e128 Xin Li 2017-11-15 02:36:20 +00:00
• cd9ba9e128 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD Xin Li 2017-11-14 16:38:23 -08:00
• 8f6c644d6f Merge commit 'b2dd6a8ef54b233843b463204ec4e3b67148a7e8' into HEAD Xin Li 2017-11-13 14:35:43 -08:00
• 3a2068bf17 Snap for 4434599 from 14dbcbcee7 to pi-release android-build-team Robot 2017-11-05 07:32:42 +00:00
• 14dbcbcee7 Use -Werror in packages/apps/Messaging/jni am: cd6efe25a4 am: dfd8a9187f am: ea2d2ad395 Chih-Hung Hsieh 2017-11-02 19:48:29 +00:00
• ea2d2ad395 Use -Werror in packages/apps/Messaging/jni am: cd6efe25a4 am: dfd8a9187f Chih-Hung Hsieh 2017-11-02 19:17:18 +00:00
• dfd8a9187f Use -Werror in packages/apps/Messaging/jni am: cd6efe25a4 Chih-Hung Hsieh 2017-11-02 19:03:25 +00:00
• cd6efe25a4 Use -Werror in packages/apps/Messaging/jni Chih-Hung Hsieh 2017-11-01 15:55:12 -07:00
• 1b629c6833 Snap for 4399706 from 467361dbcf to pi-release android-build-team Robot 2017-10-17 08:08:28 +00:00
• 467361dbcf 37742976 - Catch bad gifs Tom Taylor 2017-10-05 11:27:21 -07:00
• b2dd6a8ef5 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 3f22a4820c am: 443a8888f2 Tom Taylor 2017-07-12 19:33:47 +00:00
• 9a643d5c1c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 7ace2d5308 am: cb822ae902 Tom Taylor 2017-07-12 19:33:39 +00:00
• 443a8888f2 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 3f22a4820c Tom Taylor 2017-07-12 19:29:21 +00:00
• cb822ae902 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 7ace2d5308 Tom Taylor 2017-07-12 19:28:15 +00:00
• 7ace2d5308 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 Tom Taylor 2017-07-12 19:24:50 +00:00
• 3f22a4820c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 Tom Taylor 2017-07-12 19:24:29 +00:00
• c12af8d012 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f Tom Taylor 2017-07-12 19:20:09 +00:00
• f9b9dc3d2f 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b Tom Taylor 2017-07-12 19:15:11 +00:00
• cbed68f73b 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 Tom Taylor 2017-07-12 19:12:40 +00:00
• 93d52cb5e2 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 Tom Taylor 2017-07-12 19:11:39 +00:00
• a072033ce4 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 Tom Taylor 2017-07-12 19:09:10 +00:00
• 6ea30b87b1 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 Tom Taylor 2017-07-12 19:07:09 +00:00
• 7a6b99a4a4 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 Tom Taylor 2017-07-12 19:06:10 +00:00
• 22bbfd7360 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec Tom Taylor 2017-07-12 19:02:38 +00:00
• 7c28ca34ec 37742976 - Catch bad gifs am: e0f247e399 Tom Taylor 2017-07-12 19:01:08 +00:00
• e0f247e399 37742976 - Catch bad gifs Tom Taylor 2017-06-20 14:26:43 -07:00
• 8bd347d158 Merge "37742976 - Catch bad gifs" TreeHugger Robot 2017-06-23 22:41:27 +00:00
• 3671fd94ae 37742976 - Catch bad gifs Tom Taylor 2017-06-20 14:26:43 -07:00
• 0cf794c98b Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 am: 37f70d2951 am: 3fb6abb421 am: eaa925147a Paul Duffin 2017-06-14 14:45:17 +00:00
• eaa925147a Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 am: 37f70d2951 am: 3fb6abb421 Paul Duffin 2017-06-14 14:42:27 +00:00
• 3fb6abb421 Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 am: 37f70d2951 Paul Duffin 2017-06-14 14:40:01 +00:00