Commit Graph

  • 48001ed67e [automerger skipped] Merge remote-tracking branch 'goog/pi-androidx-dev' into merge_for_io am: 77cbf8ba98 am: e5e390887b -s ours am: a7e08be765 -s ours Alan Viverette 2018-05-02 07:29:59 -0700
  • 1119d85db6 Merge changes from topic "dp2_ffwd" into pi-preview1-androidx-dev am: 1db799d32b am: 2ed34f27b2 Alan Viverette 2018-05-02 07:16:44 -0700
  • 20884726ef [automerger skipped] Merge remote-tracking branch 'goog/pi-androidx-dev' into merge_for_io am: 77cbf8ba98 am: e5e390887b -s ours Alan Viverette 2018-05-02 07:15:53 -0700
  • 79262060f5 Restrict dejetification only whitelist of libraries. am: 56d68fb4b9 am: c79f1bd631 am: c2c8d8c822 Aurimas Liutikas 2018-05-01 18:10:56 -0700
  • 4dbfe1f9b2 Restrict dejetification only whitelist of libraries. am: 56d68fb4b9 am: c79f1bd631 Aurimas Liutikas 2018-05-01 18:06:49 -0700
  • e245f23305 Restrict dejetification only whitelist of libraries. am: 56d68fb4b9 Aurimas Liutikas 2018-05-01 18:02:14 -0700
  • 94b26b192b Restrict dejetification only whitelist of libraries. Aurimas Liutikas 2018-05-01 16:47:34 -0700
  • 98a9940740 resolve merge conflicts of 470f5b14fe734bf35294404d02bd2304a30d1c4e to pi-preview1-androidx-dev am: 7f7a6e75db am: c459411e11 am: d9746b26c7 Yigit Boyar 2018-05-01 16:26:43 -0700
  • 27977d0b2d resolve merge conflicts of 470f5b14fe734bf35294404d02bd2304a30d1c4e to pi-preview1-androidx-dev am: 7f7a6e75db am: c459411e11 Yigit Boyar 2018-05-01 16:20:45 -0700
  • 81db48b6a8 resolve merge conflicts of 470f5b14fe734bf35294404d02bd2304a30d1c4e to pi-preview1-androidx-dev am: 7f7a6e75db Yigit Boyar 2018-05-01 16:16:39 -0700
  • be390328a8 resolve merge conflicts of 470f5b14fe734bf35294404d02bd2304a30d1c4e to pi-preview1-androidx-dev Yigit Boyar 2018-05-01 14:35:22 -0700
  • c6862d921b Merge "Better attribute resolution" Leland Richardson 2018-05-01 21:57:09 +0000
  • a1c2c1e3e3 Better attribute resolution Leland Richardson 2018-05-01 12:31:38 -0700
  • e55b5dd3f0 Move to kotlin 1.2.41 Yigit Boyar 2018-04-30 13:54:06 -0700
  • c153715b9a Merge changes from topic "dp2_ffwd" into pi-preview1-androidx-dev am: 1db799d32b am: 2ed34f27b2 am: 7c18548628 Alan Viverette 2018-04-30 14:41:20 -0700
  • f23d1f1bfa Merge remote-tracking branch 'goog/pi-androidx-dev' into merge_for_io am: 77cbf8ba98 am: e5e390887b am: 82ba27d9ac Alan Viverette 2018-04-30 14:40:39 -0700
  • 4f75fb635e Merge changes from topic "dp2_ffwd" into pi-preview1-androidx-dev am: 1db799d32b am: 2ed34f27b2 Alan Viverette 2018-04-30 14:36:28 -0700
  • dbf41ede8d Merge remote-tracking branch 'goog/pi-androidx-dev' into merge_for_io am: 77cbf8ba98 am: e5e390887b Alan Viverette 2018-04-30 14:36:00 -0700
  • 3bc4daf27e Merge changes from topic "dp2_ffwd" into pi-preview1-androidx-dev am: 1db799d32b Alan Viverette 2018-04-30 14:31:54 -0700
  • 6bdc6b9a32 Merge remote-tracking branch 'goog/pi-androidx-dev' into merge_for_io am: 77cbf8ba98 Alan Viverette 2018-04-30 14:31:37 -0700
  • 167af378c9 Merge changes from topic "dp2_ffwd" into pi-preview1-androidx-dev Alan Viverette 2018-04-30 21:21:34 +0000
  • 16433258ba Improvements in jetifier errors handling. am: 448359062b am: 77b644cec5 am: ed14984e78 Filip Pavlis 2018-04-30 14:10:27 -0700
  • cfa3003c81 Improvements in jetifier errors handling. am: 448359062b am: 77b644cec5 Filip Pavlis 2018-04-30 14:04:20 -0700
  • cd14054df0 Improvements in jetifier errors handling. am: 448359062b Filip Pavlis 2018-04-30 13:58:44 -0700
  • 1fc44043ca Improvements in jetifier errors handling. Filip Pavlis 2018-04-30 20:26:09 +0100
  • 05c9cc3869 Fix r4a-cli tests Chuck Jazdzewski 2018-04-30 10:12:21 -0700
  • c2e028c360 Merge "Merge "Revert "Migrate several libraries to use kotlin script build files."" into pi-preview1-androidx-dev am: 57a6f97d08 am: 5e9b6ce100 am: 21e44ea045" Android Build Merger (Role) 2018-04-28 01:00:13 +0000
  • af5eadce1a Merge "Revert "Migrate several libraries to use kotlin script build files."" into pi-preview1-androidx-dev am: 57a6f97d08 am: 5e9b6ce100 am: 21e44ea045 Aurimas Liutikas 2018-04-27 18:00:05 -0700
  • 97669871c2 Merge "Revert "Migrate several libraries to use kotlin script build files."" into pi-preview1-androidx-dev am: 57a6f97d08 am: 5e9b6ce100 am: d407c17b24 Aurimas Liutikas 2018-04-27 18:00:03 -0700
  • fcb7300867 Merge "Revert "Migrate several libraries to use kotlin script build files."" into pi-preview1-androidx-dev am: 57a6f97d08 am: 5e9b6ce100 Aurimas Liutikas 2018-04-27 17:50:45 -0700
  • de73a5000a Merge "Revert "Migrate several libraries to use kotlin script build files."" into pi-preview1-androidx-dev am: 57a6f97d08 Aurimas Liutikas 2018-04-27 17:46:47 -0700
  • 40311f998e Revert "Migrate several libraries to use kotlin script build files." Aurimas Liutikas 2018-04-27 16:07:52 -0700
  • 6a983c1958 Merge "Disable substitution of android.support to androidx project." into pi-preview1-androidx-dev am: 97fbf66477 am: ddd114ce34 am: f7c0a8211e Aurimas Liutikas 2018-04-26 15:53:54 -0700
  • cc16be8edc Merge "Disable substitution of android.support to androidx project." into pi-preview1-androidx-dev am: 97fbf66477 am: ddd114ce34 Aurimas Liutikas 2018-04-26 15:48:45 -0700
  • 03017c3ed1 Merge "Disable substitution of android.support to androidx project." into pi-preview1-androidx-dev am: 97fbf66477 Aurimas Liutikas 2018-04-26 15:43:17 -0700
  • a223bdfc90 Disable substitution of android.support to androidx project. Aurimas Liutikas 2018-04-26 14:01:12 -0700
  • 7e7f4436b4 Merge "Merge "Better versioning support in Jetifier." into pi-preview1-androidx-dev am: 81b97d3806 am: b9647d5431 am: b608205917" Android Build Merger (Role) 2018-04-26 15:33:09 +0000
  • 15fb8cd034 Merge "Better versioning support in Jetifier." into pi-preview1-androidx-dev am: 81b97d3806 am: b9647d5431 am: b608205917 Filip Pavlis 2018-04-26 08:33:02 -0700
  • 2ba0925990 Merge "Better versioning support in Jetifier." into pi-preview1-androidx-dev am: 81b97d3806 am: b9647d5431 am: 46ed0ca98b Filip Pavlis 2018-04-26 08:33:00 -0700
  • bf6fe08d7a Merge "Better versioning support in Jetifier." into pi-preview1-androidx-dev am: 81b97d3806 am: b9647d5431 Filip Pavlis 2018-04-26 08:27:21 -0700
  • e929c5107f Merge "Better versioning support in Jetifier." into pi-preview1-androidx-dev am: 81b97d3806 Filip Pavlis 2018-04-26 08:21:25 -0700
  • ecc2051a02 Better versioning support in Jetifier. Filip Pavlis 2018-04-25 15:11:11 +0100
  • 2594c7e744 Wrote an implementation of R4A that uses the IR Jim S 2018-04-17 20:44:28 -0700
  • 201e8d92e2 Add a transaction like data frame Chuck Jazdzewski 2018-04-25 15:45:31 -0700
  • 137afb61dd Add better error messages for R4a type resolution Leland Richardson 2018-04-20 15:33:12 -0700
  • 8fa2a976b0 Fix more code completion NPE cases Leland Richardson 2018-04-20 12:33:17 -0700
  • 6b4d9685aa Fix NPE in Completion Contributor Leland Richardson 2018-04-20 11:57:04 -0700
  • 9a3014922e report an error for open components Chuck Jazdzewski 2018-04-13 11:07:34 -0700
  • 56170bc9c9 Initial implementation of R4A, from 1.2.30_as31 Jim S 2017-08-19 04:52:57 -0700
  • f45c3585be Merge "Change Navigation groupId to android.arch.navigation" into pi-preview1-androidx-dev am: e824efd890 am: ab85e01917 am: f5ae5eae03 Ian Lake 2018-04-25 16:22:54 -0700
  • 591f997693 Merge "Change Navigation groupId to android.arch.navigation" into pi-preview1-androidx-dev am: e824efd890 am: ab85e01917 Ian Lake 2018-04-25 16:18:20 -0700
  • 35301ebf99 Merge "Change Navigation groupId to android.arch.navigation" into pi-preview1-androidx-dev am: e824efd890 Ian Lake 2018-04-25 16:13:54 -0700
  • 126e076b51 Merge "Change Navigation groupId to android.arch.navigation" into pi-preview1-androidx-dev TreeHugger Robot 2018-04-25 23:05:39 +0000
  • 9e88354e83 Merge "Merge "Change WorkManager groupId to android.arch.work." into pi-preview1-androidx-dev am: b94a0e443a am: 7365544f33 am: ec3ebd4348" Android Build Merger (Role) 2018-04-25 22:44:28 +0000
  • dcfba01bea Merge "Change WorkManager groupId to android.arch.work." into pi-preview1-androidx-dev am: b94a0e443a am: 7365544f33 am: ec3ebd4348 Sumir Kataria 2018-04-25 15:44:21 -0700
  • c1c07b46e7 Merge "Change WorkManager groupId to android.arch.work." into pi-preview1-androidx-dev am: b94a0e443a am: 7365544f33 am: 7923433ea2 Sumir Kataria 2018-04-25 15:44:17 -0700
  • 140bf295d4 Merge "Change WorkManager groupId to android.arch.work." into pi-preview1-androidx-dev am: b94a0e443a am: 7365544f33 Sumir Kataria 2018-04-25 15:39:36 -0700
  • bc36b314d2 Merge "Change WorkManager groupId to android.arch.work." into pi-preview1-androidx-dev am: b94a0e443a Sumir Kataria 2018-04-25 15:34:40 -0700
  • 3a8104ec1e Change WorkManager groupId to android.arch.work. Sumir Kataria 2018-04-25 13:38:03 -0700
  • 998442c476 Merge "Better versioning support in Jetifier." Filip Pavlis 2018-04-25 20:35:39 +0000
  • eb2bcac488 Migrate support to androidx.contraintlayout am: 4d1752971f am: f61fd95636 am: 328dc0974d Filip Pavlis 2018-04-25 12:42:15 -0700
  • c6fee2b26a Migrate support to androidx.contraintlayout am: 4d1752971f am: f61fd95636 Filip Pavlis 2018-04-25 12:38:10 -0700
  • b3723526b3 Migrate support to androidx.contraintlayout am: 4d1752971f Filip Pavlis 2018-04-25 12:35:04 -0700
  • 6d1876839f Better versioning support in Jetifier. Filip Pavlis 2018-04-25 15:11:11 +0100
  • fe847f2e6c Change Navigation groupId to android.arch.navigation Ian Lake 2018-04-25 10:56:19 -0700
  • 50e45bba77 Migrate support to androidx.contraintlayout Filip Pavlis 2018-04-25 18:33:35 +0100
  • 35bc997524 Merge "Update to AGP 3.2.0-alpha13" into pi-preview1-androidx-dev am: cff2c9094b am: deecbcc661 am: f1b63dec65 Aurimas Liutikas 2018-04-23 15:15:41 -0700
  • bfadd305af Merge "Update to AGP 3.2.0-alpha13" into pi-preview1-androidx-dev am: cff2c9094b am: deecbcc661 Aurimas Liutikas 2018-04-23 15:12:04 -0700
  • 260f516420 Merge "Update to AGP 3.2.0-alpha13" into pi-preview1-androidx-dev am: cff2c9094b Aurimas Liutikas 2018-04-23 15:08:03 -0700
  • 0b13b11d02 Merge "Update to AGP 3.2.0-alpha13" into pi-preview1-androidx-dev Aurimas Liutikas 2018-04-23 22:01:40 +0000
  • 89efbf7b21 Merge "Set jetifier version to 1.0.0-alpha01" into pi-preview1-androidx-dev am: 2e1f0ebe4e am: 5554aec6bc am: 1ecf8da966 Aurimas Liutikas 2018-04-23 14:12:00 -0700
  • 49c7b535ff Merge "Set jetifier version to 1.0.0-alpha01" into pi-preview1-androidx-dev am: 2e1f0ebe4e am: 5554aec6bc Aurimas Liutikas 2018-04-23 14:08:15 -0700
  • 3a58b9f48f Merge "Set jetifier version to 1.0.0-alpha01" into pi-preview1-androidx-dev am: 2e1f0ebe4e Aurimas Liutikas 2018-04-23 14:04:44 -0700
  • da90d0ce02 Set jetifier version to 1.0.0-alpha01 Aurimas Liutikas 2018-04-23 13:53:40 -0700
  • 7fc6e8957b Update to AGP 3.2.0-alpha13 Aurimas Liutikas 2018-04-23 13:41:57 -0700
  • 2f0bb5c45d Merge remote-tracking branch 'goog/flatfoot-background' into merge_work am: dd06969d20 am: f19c0cd921 am: 96059b0d87 Sumir Kataria 2018-04-20 15:57:56 -0700
  • da2fb6a3bb Merge remote-tracking branch 'goog/flatfoot-background' into merge_work am: dd06969d20 am: f19c0cd921 Sumir Kataria 2018-04-20 15:53:18 -0700
  • 22cb844be8 Merge remote-tracking branch 'goog/flatfoot-background' into merge_work am: dd06969d20 Sumir Kataria 2018-04-20 15:48:42 -0700
  • 896e731cac Merge remote-tracking branch 'goog/flatfoot-background' into merge_work Sumir Kataria 2018-04-20 10:18:58 -0700
  • 30d8b34f46 [automerger skipped] Start enforcing javac warnings. am: 3ac069f816 am: aa5c879f16 -s ours am: 320b614ced -s ours Aurimas Liutikas 2018-04-20 13:51:41 -0700
  • f128c9193a [automerger skipped] Start enforcing javac warnings. am: 3ac069f816 am: aa5c879f16 -s ours Aurimas Liutikas 2018-04-20 13:47:37 -0700
  • 548e76584b Start enforcing javac warnings. am: 3ac069f816 Aurimas Liutikas 2018-04-20 13:44:31 -0700
  • 265d8021ac Start enforcing javac warnings. Aurimas Liutikas 2018-04-04 13:25:38 -0700
  • 867e11426f Merge "Merge remote-tracking branch 'goog/flatfoot-navigation' into ub-androidx-1.0-alpha" into pi-preview1-androidx-dev am: a15e878fec am: 81e6a517ba am: 92ed3160d9 Sergey Vasilinets 2018-04-19 16:12:18 -0700
  • 993915d83c Merge "Merge remote-tracking branch 'goog/flatfoot-navigation' into ub-androidx-1.0-alpha" into pi-preview1-androidx-dev am: a15e878fec am: 81e6a517ba Sergey Vasilinets 2018-04-19 16:08:11 -0700
  • 5ad166c5d7 Merge "Merge remote-tracking branch 'goog/flatfoot-navigation' into ub-androidx-1.0-alpha" into pi-preview1-androidx-dev am: a15e878fec Sergey Vasilinets 2018-04-19 15:58:30 -0700
  • 05d0a33c12 Merge "Merge remote-tracking branch 'goog/flatfoot-navigation' into ub-androidx-1.0-alpha" into pi-preview1-androidx-dev Sergey Vasilinets 2018-04-19 22:35:17 +0000
  • 59337c1aa5 Merge remote-tracking branch 'goog/flatfoot-navigation' into ub-androidx-1.0-alpha Sergey Vasilinets 2018-04-18 17:01:28 -0700
  • c4e822d038 resolve merge conflicts of cd7a2402efc74d6d676b1966464307bb58907321 to pi-preview1-androidx-dev am: 26038b2b81 am: d2f4beab6e am: 65208e6f55 Yigit Boyar 2018-04-19 13:36:42 -0700
  • 14a5e4eb28 resolve merge conflicts of cd7a2402efc74d6d676b1966464307bb58907321 to pi-preview1-androidx-dev am: 26038b2b81 am: d2f4beab6e Yigit Boyar 2018-04-19 13:33:03 -0700
  • 7eb60e4fb5 resolve merge conflicts of cd7a2402efc74d6d676b1966464307bb58907321 to pi-preview1-androidx-dev am: 26038b2b81 Yigit Boyar 2018-04-19 13:29:28 -0700
  • 2ea8bc39b2 resolve merge conflicts of cd7a2402efc74d6d676b1966464307bb58907321 to pi-preview1-androidx-dev Yigit Boyar 2018-04-19 12:38:59 -0700
  • b8d0b7393d Merge "Handle Kotlin to Java Relations" into oc-mr1-jetpack-dev Yigit Boyar 2018-04-19 19:01:45 +0000
  • a9c1525fef [automerger skipped] Merge "Update paging version number to rc1 - DO NOT MERGE" into oc-mr1-jetpack-dev am: 6c3d3896c5 -s ours am: 343de4c400 -s ours am: 975695b5d6 -s ours am: 18ca0bf15e -s ours Chris Craik 2018-04-19 11:00:01 -0700
  • 43fd8a60e8 [automerger skipped] Merge "Update paging version number to rc1 - DO NOT MERGE" into oc-mr1-jetpack-dev am: 6c3d3896c5 -s ours am: 343de4c400 -s ours am: 975695b5d6 -s ours Chris Craik 2018-04-19 10:54:50 -0700
  • ea4d80f06e [automerger skipped] Merge "Update paging version number to rc1 - DO NOT MERGE" into oc-mr1-jetpack-dev am: 6c3d3896c5 -s ours am: 343de4c400 -s ours Chris Craik 2018-04-19 10:51:35 -0700
  • a1e7c81903 [automerger skipped] Merge "Update paging version number to rc1 - DO NOT MERGE" into oc-mr1-jetpack-dev am: 6c3d3896c5 -s ours Chris Craik 2018-04-19 10:46:39 -0700
  • 78e4c2ba34 Merge "Update paging version number to rc1 - DO NOT MERGE" into oc-mr1-jetpack-dev TreeHugger Robot 2018-04-19 17:38:27 +0000
  • bda2dc2a77 Handle Kotlin to Java Relations Yigit Boyar 2018-04-19 10:06:38 -0700
  • cd3bef2089 Update paging version number to rc1 - DO NOT MERGE Chris Craik 2018-04-18 16:33:39 -0700