Commit Graph

  • 652a5ea1e9 Merge "Enable gmaven diff archive for androidx builds." into pi-preview1-androidx-dev am: b821826c2c am: e1af52ba08 Aurimas Liutikas 2018-05-16 19:30:07 -0700
  • 25e050bf5d Merge "Enable gmaven diff archive for androidx builds." into pi-preview1-androidx-dev am: b821826c2c am: e1af52ba08 am: bc7faa395a Aurimas Liutikas 2018-05-16 19:18:39 -0700
  • 63ea8e1294 Merge "Enable gmaven diff archive for androidx builds." into pi-preview1-androidx-dev am: b821826c2c am: e1af52ba08 Aurimas Liutikas 2018-05-16 19:16:02 -0700
  • e7895020d1 Merge "Enable gmaven diff archive for androidx builds." into pi-preview1-androidx-dev am: b821826c2c Aurimas Liutikas 2018-05-16 19:12:33 -0700
  • c3cf9f2f7b Enable gmaven diff archive for androidx builds. Aurimas Liutikas 2018-05-16 15:54:14 -0700
  • 67b328468d Merge "[R4A] Recompose component subtree only" Leland Richardson 2018-05-17 00:48:26 +0000
  • 82b311ae70 [R4A] Recompose component subtree only Leland Richardson 2018-05-16 14:24:59 -0700
  • 1bde1d3794 Update cli analysis tests Chuck Jazdzewski 2018-05-16 17:04:44 -0700
  • c4e38c86f6 [automerger skipped] Merge "DO NOT MERGE create room rc1 release version" into oc-mr1-jetpack-dev am: 369d90bfa1 -s ours am: 8a670e1a05 -s ours am: 9ef29ced8b am: 212d1fa271 -s ours Yigit Boyar 2018-05-16 15:31:24 -0700
  • 121ad2cb1c [automerger skipped] Merge "DO NOT MERGE create room rc1 release version" into oc-mr1-jetpack-dev am: 369d90bfa1 -s ours am: 8a670e1a05 -s ours am: 9ef29ced8b Yigit Boyar 2018-05-16 15:14:40 -0700
  • 90eda020a9 [automerger skipped] Merge "DO NOT MERGE create room rc1 release version" into oc-mr1-jetpack-dev am: 369d90bfa1 -s ours am: 8a670e1a05 -s ours am: 9ef29ced8b -s ours am: a6dcc4dbcb -s ours Yigit Boyar 2018-05-16 14:40:36 -0700
  • bb70764aa2 [automerger skipped] Merge "DO NOT MERGE create room rc1 release version" into oc-mr1-jetpack-dev am: 369d90bfa1 -s ours am: 8a670e1a05 -s ours am: 9ef29ced8b -s ours Yigit Boyar 2018-05-16 14:35:44 -0700
  • 948fb530bf [automerger skipped] Merge "DO NOT MERGE create room rc1 release version" into oc-mr1-jetpack-dev am: 369d90bfa1 -s ours am: 8a670e1a05 -s ours Yigit Boyar 2018-05-16 14:34:40 -0700
  • ab3151fb37 [automerger skipped] Merge "DO NOT MERGE create room rc1 release version" into oc-mr1-jetpack-dev am: 369d90bfa1 -s ours Yigit Boyar 2018-05-16 14:30:42 -0700
  • 86327012e4 Merge "DO NOT MERGE create room rc1 release version" into oc-mr1-jetpack-dev TreeHugger Robot 2018-05-16 21:19:17 +0000
  • 26abf0736a Merge "Switch PagingRX to use default paging version" into pi-androidx-dev am: 5f66dcd898 Chris Craik 2018-05-16 13:31:07 -0700
  • 499607ad74 Switch PagingRX to use default paging version Chris Craik 2018-05-16 11:04:32 -0700
  • 7f567f4236 Merge "Move CompositionContext into runtime" Leland Richardson 2018-05-16 15:54:21 +0000
  • 4c8b9a0eb7 [automerger skipped] Update Paging RX to RC1 - DO NOT MERGE am: 7733abb105 -s ours am: 0ee2ec02d1 -s ours am: f58db22e29 am: cb02615475 -s ours Chris Craik 2018-05-15 19:06:18 -0700
  • 18ea1ea948 [automerger skipped] Update Paging RX to RC1 - DO NOT MERGE am: 7733abb105 -s ours am: 0ee2ec02d1 -s ours am: f58db22e29 Chris Craik 2018-05-15 18:38:25 -0700
  • dda8139ae6 [automerger skipped] Update Paging RX to RC1 - DO NOT MERGE am: 7733abb105 -s ours am: 0ee2ec02d1 -s ours am: f58db22e29 -s ours am: 0820733443 -s ours Chris Craik 2018-05-15 18:21:59 -0700
  • efa352f5b8 [automerger skipped] Update Paging RX to RC1 - DO NOT MERGE am: 7733abb105 -s ours am: 0ee2ec02d1 -s ours am: f58db22e29 -s ours Chris Craik 2018-05-15 18:18:30 -0700
  • 59578ae79c [automerger skipped] Update Paging RX to RC1 - DO NOT MERGE am: 7733abb105 -s ours am: 0ee2ec02d1 -s ours Chris Craik 2018-05-15 18:15:58 -0700
  • 2624a2a6c3 [automerger skipped] Update Paging RX to RC1 - DO NOT MERGE am: 7733abb105 -s ours Chris Craik 2018-05-15 18:10:47 -0700
  • bba9350144 Move CompositionContext into runtime Leland Richardson 2018-05-15 17:39:11 -0700
  • a4864d17e5 Update Paging RX to RC1 - DO NOT MERGE Chris Craik 2018-05-15 16:56:23 -0700
  • 8527e89c34 Stabilize WrapperView setter generation Jim S 2018-05-15 15:16:21 -0700
  • 2558e84256 [R4A] Cache attribute resolution Leland Richardson 2018-05-15 11:46:27 -0700
  • 2bbcc39a3d R4A Runtime Refactor Leland Richardson 2018-05-14 09:44:59 -0700
  • 216ccdb20e DO NOT MERGE create room rc1 release version Yigit Boyar 2018-05-11 11:24:31 -0700
  • 63c9e3f4a9 Merge "Fix diagnostics tests" Chuck Jazdzewski 2018-05-07 19:49:56 +0000
  • 2168e32aa9 Fix diagnostics tests Chuck Jazdzewski 2018-05-07 12:47:38 -0700
  • 7ebe2245fc Merge "Avoid passing around IR classes unnecessarily" Jim Sproch 2018-05-07 19:24:35 +0000
  • b043112b56 Simplify frame types Chuck Jazdzewski 2018-05-07 12:03:55 -0700
  • 9796cb4853 Avoid passing around IR classes unnecessarily Jim S 2018-05-07 12:02:45 -0700
  • 753975bed5 Cleanup R4A structure, fix bugs along the way Jim S 2018-05-05 15:21:51 -0700
  • 15f29d2223 [automerger skipped] DO NOT MERGE: Finalize room and paging versions am: 2529f12266 -s ours am: 3d06e21b1e -s ours am: 4932f62815 am: de3a3876e2 -s ours Sergey Vasilinets 2018-05-04 15:00:27 -0700
  • d86d00b784 [automerger skipped] DO NOT MERGE: Finalize room and paging versions am: 2529f12266 -s ours am: 3d06e21b1e -s ours am: 4932f62815 Sergey Vasilinets 2018-05-04 14:44:42 -0700
  • 8b1f90052c [automerger skipped] DO NOT MERGE: Finalize room and paging versions am: 2529f12266 -s ours am: 3d06e21b1e -s ours am: 4932f62815 -s ours am: ffd2e10785 -s ours Sergey Vasilinets 2018-05-04 14:42:07 -0700
  • 584cb12f45 [automerger skipped] DO NOT MERGE: Finalize room and paging versions am: 2529f12266 -s ours am: 3d06e21b1e -s ours am: 4932f62815 -s ours Sergey Vasilinets 2018-05-04 14:35:05 -0700
  • 18b296e58b [automerger skipped] DO NOT MERGE: Finalize room and paging versions am: 2529f12266 -s ours am: 3d06e21b1e -s ours Sergey Vasilinets 2018-05-04 14:30:37 -0700
  • cb8651ae7b [automerger skipped] DO NOT MERGE: Finalize room and paging versions am: 2529f12266 -s ours Sergey Vasilinets 2018-05-04 14:25:36 -0700
  • 13848ea2c8 DO NOT MERGE: Finalize room and paging versions Sergey Vasilinets 2018-05-04 13:13:48 -0700
  • 65bb9e5396 [automerger skipped] Merge app-toolkit build into support library. am: fbdf0efb75 am: adb1e4d7a9 am: 256efe029e -s ours Aurimas Liutikas 2018-05-04 12:16:19 -0700
  • 5f6d4583d7 [automerger skipped] Merge app-toolkit build into support library. am: fbdf0efb75 am: adb1e4d7a9 am: 05f510c33e -s ours Aurimas Liutikas 2018-05-04 12:08:40 -0700
  • b6b6862bf1 Merge app-toolkit build into support library. am: fbdf0efb75 am: adb1e4d7a9 Aurimas Liutikas 2018-05-04 12:08:37 -0700
  • 7187455b44 Merge app-toolkit build into support library. am: fbdf0efb75 am: adb1e4d7a9 Aurimas Liutikas 2018-05-04 12:03:33 -0700
  • 1fb156c76e Merge app-toolkit build into support library. am: fbdf0efb75 Aurimas Liutikas 2018-05-04 12:00:03 -0700
  • 0e941fc503 Merge app-toolkit build into support library. Aurimas Liutikas 2018-04-26 13:41:59 -0700
  • 26f5f293a0 Merge app-toolkit build into support library. Aurimas Liutikas 2018-04-26 13:41:59 -0700
  • 5f01646a9e Merge "Move Kotlin back to 1.2.20 for Jetifier dependencies am: fa3ddb1c5a am: 270ff14032 am: d370473c90" Android Build Merger (Role) 2018-05-04 15:35:34 +0000
  • dfba9bdcd3 Move Kotlin back to 1.2.20 for Jetifier dependencies am: fa3ddb1c5a am: 270ff14032 am: d370473c90 Aurimas Liutikas 2018-05-04 08:35:27 -0700
  • a870ddaa58 Move Kotlin back to 1.2.20 for Jetifier dependencies am: fa3ddb1c5a am: 270ff14032 am: 00b4f5391d Aurimas Liutikas 2018-05-04 08:35:22 -0700
  • 7f08ae910f Move Kotlin back to 1.2.20 for Jetifier dependencies am: fa3ddb1c5a am: 270ff14032 Aurimas Liutikas 2018-05-04 08:29:43 -0700
  • 8da4c8802a Move Kotlin back to 1.2.20 for Jetifier dependencies am: fa3ddb1c5a am: 270ff14032 Aurimas Liutikas 2018-05-04 08:29:43 -0700
  • 9c322803c0 Move Kotlin back to 1.2.20 for Jetifier dependencies am: fa3ddb1c5a Aurimas Liutikas 2018-05-04 08:25:09 -0700
  • 77292a9e09 Improve code completion popups and rendering Leland Richardson 2018-05-03 19:51:15 -0700
  • 180a79875e Move Kotlin back to 1.2.20 for Jetifier dependencies Aurimas Liutikas 2018-05-03 18:51:55 -0700
  • ad4af9c295 [automerger skipped] Merge "Fix remaining error-prone warnings and enable it for debug variant." into pi-preview1-androidx-dev am: 27c9cb575a am: 9d4bde3a5c am: b9397b044b -s ours android-build-team Robot 2018-05-03 18:04:27 -0700
  • 1c0249b89e Downgrade to ASM 6.0 for jetifier. am: da4ca2dd50 am: c2885fd334 am: 51fc3eea33 Aurimas Liutikas 2018-05-03 18:01:40 -0700
  • b060543ac5 Merge "Fix remaining error-prone warnings and enable it for debug variant." into pi-preview1-androidx-dev am: 27c9cb575a am: 9d4bde3a5c android-build-team Robot 2018-05-03 16:08:35 -0700
  • da622ad266 [automerger skipped] Merge "Fix remaining error-prone warnings and enable it for debug variant." into pi-preview1-androidx-dev am: 27c9cb575a am: 9d4bde3a5c am: d88d4b89e0 -s ours android-build-team Robot 2018-05-03 16:02:42 -0700
  • 3133fc5226 Merge "Fix remaining error-prone warnings and enable it for debug variant." into pi-preview1-androidx-dev am: 27c9cb575a am: 9d4bde3a5c android-build-team Robot 2018-05-03 15:59:37 -0700
  • ea3c0627f0 Temporary patch for NoClassDef bug Leland Richardson 2018-05-03 15:04:29 -0700
  • f4504e9047 Merge "Fix remaining error-prone warnings and enable it for debug variant." into pi-preview1-androidx-dev am: 27c9cb575a android-build-team Robot 2018-05-03 15:56:08 -0700
  • 98e6a1f40c Merge "Fix remaining error-prone warnings and enable it for debug variant." into pi-preview1-androidx-dev android-build-team Robot 2018-05-03 22:47:26 +0000
  • e554ffc2e3 Fix remaining error-prone warnings and enable it for debug variant. Aurimas Liutikas 2018-05-02 13:06:34 -0700
  • f5cdd15512 Merge "Fix remaining error-prone warnings and enable it for debug variant." android-build-team Robot 2018-05-03 22:33:31 +0000
  • d6ffdf264c Downgrade to ASM 6.0 for jetifier. am: da4ca2dd50 am: c2885fd334 Aurimas Liutikas 2018-05-03 15:23:14 -0700
  • 0101c02252 Downgrade to ASM 6.0 for jetifier. am: da4ca2dd50 am: c2885fd334 am: 69fdbf2a71 Aurimas Liutikas 2018-05-03 14:29:38 -0700
  • 2ebde0e319 Downgrade to ASM 6.0 for jetifier. am: da4ca2dd50 am: c2885fd334 Aurimas Liutikas 2018-05-03 14:25:31 -0700
  • b2a049b71f Downgrade to ASM 6.0 for jetifier. am: da4ca2dd50 Aurimas Liutikas 2018-05-03 14:21:26 -0700
  • 8869fa9fc4 Fix remaining error-prone warnings and enable it for debug variant. Aurimas Liutikas 2018-05-02 13:06:34 -0700
  • bac230df37 Downgrade to ASM 6.0 for jetifier. Aurimas Liutikas 2018-05-03 13:23:26 -0700
  • 5f8efaefe0 [automerger skipped] resolve merge conflicts of 4b412beaf15a9dc02ac97d7b913a0dfc0eb83312 to pi-dev-plus-aosp am: 844aef1f45 -s ours Filip Pavlis 2018-05-03 12:30:37 -0700
  • 44097238e1 resolve merge conflicts of 4b412beaf15a9dc02ac97d7b913a0dfc0eb83312 to pi-dev-plus-aosp Filip Pavlis 2018-05-03 19:15:59 +0100
  • d3c1315e60 Rename contentpaging to contentpager. am: 4805884f38 am: 4b412beaf1 am: 5eea4bd2fc Filip Pavlis 2018-05-03 11:13:37 -0700
  • a988bc03dd Merge "resolve merge conflicts of b02d633eec7dc2a03126862207d45936043f5dfd to master" android-build-team Robot 2018-05-03 18:10:06 +0000
  • d1bf8bc2c2 Migrate support lib to depend on material instead of design libs. Aurimas Liutikas 2018-05-02 15:19:18 -0700
  • 709a43ed68 Rename contentpaging to contentpager. am: 4805884f38 am: 4b412beaf1 Filip Pavlis 2018-05-03 10:43:55 -0700
  • d3b63db310 Rename contentpaging to contentpager. am: 4805884f38 Filip Pavlis 2018-05-03 10:38:49 -0700
  • 1bdbcc5c99 Rename contentpaging to contentpager. Filip Pavlis 2018-05-03 17:49:59 +0100
  • 3b8765316d [automerger skipped] Merge "Migrate support lib to depend on material instead of design libs." into pi-preview1-androidx-dev am: ec2a458533 am: 23274a52cd -s ours am: 32abfa45e0 Aurimas Liutikas 2018-05-03 09:43:57 -0700
  • f17e801b1a [automerger skipped] Merge "Migrate support lib to depend on material instead of design libs." into pi-preview1-androidx-dev am: ec2a458533 am: 23274a52cd -s ours Aurimas Liutikas 2018-05-03 09:35:36 -0700
  • 358a3df61e resolve merge conflicts of b02d633eec7dc2a03126862207d45936043f5dfd to master Aurimas Liutikas 2018-05-03 09:22:46 -0700
  • 24023b58a6 Merge "Migrate support lib to depend on material instead of design libs." into pi-preview1-androidx-dev am: ec2a458533 am: 23274a52cd Aurimas Liutikas 2018-05-03 08:36:25 -0700
  • b1b5aca3d3 Merge "Migrate support lib to depend on material instead of design libs." into pi-preview1-androidx-dev am: ec2a458533 Aurimas Liutikas 2018-05-03 08:31:52 -0700
  • 5fe3a1c7ca Merge "Migrate support lib to depend on material instead of design libs." into pi-preview1-androidx-dev Aurimas Liutikas 2018-05-03 15:21:26 +0000
  • 4b0148500e Merge "Filter dejetification even more to drop ktx libraries" into pi-preview1-androidx-dev am: 30c15bd740 am: 1eeed82cd8 am: bceff19fd5 android-build-team Robot 2018-05-03 08:20:59 -0700
  • 5b6d908f5b Restrict dejetification only whitelist of libraries. am: 56d68fb4b9 am: c79f1bd631 am: 97401363ac Aurimas Liutikas 2018-05-03 08:11:19 -0700
  • a5240a9946 resolve merge conflicts of 470f5b14fe734bf35294404d02bd2304a30d1c4e to pi-preview1-androidx-dev am: 7f7a6e75db am: c459411e11 am: f7ac27e94a Yigit Boyar 2018-05-03 08:09:17 -0700
  • 8d25567908 Migrate support lib to depend on material instead of design libs. Aurimas Liutikas 2018-05-02 15:19:18 -0700
  • a23a033e42 Merge "Filter dejetification even more to drop ktx libraries" into pi-preview1-androidx-dev am: 30c15bd740 am: 1eeed82cd8 android-build-team Robot 2018-05-02 16:00:02 -0700
  • 9434233bca Merge "Filter dejetification even more to drop ktx libraries" into pi-preview1-androidx-dev am: 30c15bd740 am: 1eeed82cd8 am: 709a4a69dd android-build-team Robot 2018-05-02 15:51:09 -0700
  • 5c0a8bf6c5 Merge "Filter dejetification even more to drop ktx libraries" into pi-preview1-androidx-dev am: 30c15bd740 am: 1eeed82cd8 android-build-team Robot 2018-05-02 15:47:54 -0700
  • 30f5e37fbb Merge "Filter dejetification even more to drop ktx libraries" into pi-preview1-androidx-dev am: 30c15bd740 android-build-team Robot 2018-05-02 15:43:53 -0700
  • b3b946ae61 Filter dejetification even more to drop ktx libraries Aurimas Liutikas 2018-05-02 14:58:10 -0700
  • a1933ceff0 Restrict dejetification only whitelist of libraries. am: 56d68fb4b9 am: c79f1bd631 Aurimas Liutikas 2018-05-02 14:45:51 -0700
  • 1177a0a46b resolve merge conflicts of 470f5b14fe734bf35294404d02bd2304a30d1c4e to pi-preview1-androidx-dev am: 7f7a6e75db am: c459411e11 Yigit Boyar 2018-05-02 14:44:32 -0700
  • 31855ffe53 Merge changes from topic "dp2_ffwd" into pi-preview1-androidx-dev am: 1db799d32b am: 2ed34f27b2 am: ae276b6b6a Alan Viverette 2018-05-02 07:30:42 -0700