Commit Graph

  • b5fb348a48 Merge "Update version number for 27.0.1" into oc-mr1-support-27.0-dev am: 14aa63b591 Alan Viverette 2017-11-06 22:30:04 +0000
  • 3b7f26b28a resolve merge conflicts of 8f07b779f6 to oc-mr1-dev-plus-aosp Xin Li 2017-11-06 13:16:41 -0800
  • f9f7b0c9d7 Update version number for 27.0.1 Alan Viverette 2017-11-06 14:52:50 -0500
  • 8527c4ac9a [automerger] Add kotlin to buildSrc am: 6aa53caa4a Android Build Merger (Role) 2017-11-06 19:47:38 +0000
  • a51044671c Add kotlin to buildSrc Sergey Vasilinets 2017-11-03 12:20:28 -0700
  • 38d2ee4bbf [automerger] Media-compat-test: Make media-compat-test-lib as Android library am: beffc44637 Android Build Merger (Role) 2017-11-06 07:44:48 +0000
  • 75cb61138a Media-compat-test: Make media-compat-test-lib as Android library Hyundo Moon 2017-11-06 15:08:43 +0900
  • 438e172359 [automerger] Finalize api & bump version 1.0.0 am: 44f6e7df60 am: 4efa577ca3 Android Build Merger (Role) 2017-11-04 06:39:21 +0000
  • 08604bb90b Finalize api & bump version 1.0.0 am: 44f6e7df60 Sergey Vasilinets 2017-11-04 06:38:32 +0000
  • b08275c739 Finalize api & bump version 1.0.0 am: 44f6e7df60 Sergey Vasilinets 2017-11-04 06:38:32 +0000
  • fe1e3c315e Finalize api & bump version 1.0.0 am: 44f6e7df60 Sergey Vasilinets 2017-11-04 06:38:32 +0000
  • 7b8e6701af Finalize api & bump version 1.0.0 Sergey Vasilinets 2017-11-02 17:26:55 -0700
  • 4785ba136a Merge commit 'd49707aa670e95c862c01fdff94c7221eba94b5f' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master Xin Li 2017-11-02 14:46:14 -0700
  • 215b0939c5 Merge commit 'ac30d1b92b789052ed8a1bf9ed1c66a9e5cf83db' into fix_nav2 Aurimas Liutikas 2017-11-02 09:13:03 -0700
  • f71aa9ed6a [automerger] Unify creation of source jars. am: ac30d1b92b am: fdec58bb64 Android Build Merger (Role) 2017-11-02 15:28:46 +0000
  • 647fb4db86 Unify creation of source jars. am: ac30d1b92b Aurimas Liutikas 2017-11-02 15:28:00 +0000
  • 79b9452034 Unify creation of source jars. am: ac30d1b92b Aurimas Liutikas 2017-11-02 15:28:00 +0000
  • 5b937d4d7c Unify creation of source jars. Aurimas Liutikas 2017-11-01 18:47:57 -0700
  • f631abbcd8 resolve merge conflicts of b6838fd2d2 to oc-mr1-dev-plus-aosp am: be533ab190 Xin Li 2017-11-01 20:44:54 +0000
  • 20586faf16 resolve merge conflicts of b6838fd2d2 to oc-mr1-dev-plus-aosp Xin Li 2017-11-01 11:42:44 -0700
  • 01a35fcb26 Merge commit '4cd73c5f02d451e1022a71a521ca79a445f66673' from oc-mr1-support-27.0-dev to stage-aosp-master. Xin Li 2017-10-30 17:11:33 -0700
  • 41c74b142d [automerger] Handle no-diff case in gmaven differ am: f2505641fd am: ba53cfae29 Android Build Merger (Role) 2017-10-27 23:18:00 +0000
  • 8672abbba9 Handle no-diff case in gmaven differ am: f2505641fd Yigit Boyar 2017-10-27 23:17:21 +0000
  • 1ffce18283 Handle no-diff case in gmaven differ am: f2505641fd Yigit Boyar 2017-10-27 23:17:21 +0000
  • 268cfda55e Handle no-diff case in gmaven differ am: f2505641fd Yigit Boyar 2017-10-27 23:17:20 +0000
  • a7402a88ff Handle no-diff case in gmaven differ Yigit Boyar 2017-10-27 13:56:02 -0700
  • 4912eeff44 Merge "Revert "Revert "Update supportlib-master to API 28""" TreeHugger Robot 2017-10-27 17:30:35 +0000
  • e882601afd Revert "Revert "Update supportlib-master to API 28"" Jason Monk 2017-10-27 13:49:48 +0000
  • 678876fa3e [automerger] Move to AGP 3.0.0 stable am: 35675c8000 am: 913c999cca Android Build Merger (Role) 2017-10-25 20:54:21 +0000
  • f5029dcb31 Move to AGP 3.0.0 stable am: 35675c8000 Aurimas Liutikas 2017-10-25 20:53:45 +0000
  • 8415d373be Move to AGP 3.0.0 stable am: 35675c8000 Aurimas Liutikas 2017-10-25 20:53:45 +0000
  • faa15aa0b4 Move to AGP 3.0.0 stable am: 35675c8000 Aurimas Liutikas 2017-10-25 20:53:44 +0000
  • 759582396b Move to AGP 3.0.0 stable 😁 Aurimas Liutikas 2017-10-25 11:17:16 -0700
  • b918bf697e Move to AGP 3.0.0 stable 😁 Aurimas Liutikas 2017-10-25 11:17:16 -0700
  • 08041cc6c1 [automerger] Move to AGP 3.0.0 stable 😁 am: 19346a87f5 Android Build Merger (Role) 2017-10-25 18:35:40 +0000
  • b631484cdd Move to AGP 3.0.0 stable 😁 Aurimas Liutikas 2017-10-25 11:17:16 -0700
  • a73d497ad0 Move to AGP 3.0.0 stable 😁 Aurimas Liutikas 2017-10-25 11:17:16 -0700
  • be3df918b1 [automerger] Include kotlin test apps in artifacts am: e606d6d141 am: 1b2745ccba Android Build Merger (Role) 2017-10-20 23:52:25 +0000
  • ad5d8e5491 Include kotlin test apps in artifacts am: e606d6d141 Yigit Boyar 2017-10-20 23:51:36 +0000
  • f1fd025e0b Include kotlin test apps in artifacts am: e606d6d141 Yigit Boyar 2017-10-20 23:51:35 +0000
  • 14065cc68a Include kotlin test apps in artifacts am: e606d6d141 Yigit Boyar 2017-10-20 23:51:34 +0000
  • eb812c4eba Include kotlin test apps in artifacts Yigit Boyar 2017-09-07 12:37:36 -0700
  • 9b4f674597 Revert "Update supportlib-master to API 28" Jason Monk 2017-10-19 18:18:09 +0000
  • 34ae6b2c4a Update supportlib-master to API 28 Jason Monk 2017-10-18 15:35:08 -0400
  • 977c3e5c99 [automerger] Merge "Don't keep timestamps in source JARs" into oc-mr1-support-27.0-dev am: a2ce18a9b2 am: 5082b65991 Android Build Merger (Role) 2017-10-19 12:59:07 +0000
  • eaeb134fcf Merge "Don't keep timestamps in source JARs" into oc-mr1-support-27.0-dev am: a2ce18a9b2 Alan Viverette 2017-10-19 12:58:18 +0000
  • 08d090be5a Merge "Don't keep timestamps in source JARs" into oc-mr1-support-27.0-dev am: a2ce18a9b2 Alan Viverette 2017-10-19 12:58:17 +0000
  • 8aa2a67334 Merge "Don't keep timestamps in source JARs" into oc-mr1-support-27.0-dev am: a2ce18a9b2 Alan Viverette 2017-10-19 12:58:16 +0000
  • 17a179547e Merge "Don't keep timestamps in source JARs" into oc-mr1-support-27.0-dev TreeHugger Robot 2017-10-19 12:53:38 +0000
  • eaeffe19c9 Don't keep timestamps in source JARs Alan Viverette 2017-10-19 11:18:05 +0100
  • 996f0b63f3 [automerger] Merge "Update docs generation to exclude dependency R files" into oc-mr1-support-27.0-dev am: 5efd02bc63 am: 2f34905361 Android Build Merger (Role) 2017-10-18 23:42:12 +0000
  • 723f44fb91 Merge "Update docs generation to exclude dependency R files" into oc-mr1-support-27.0-dev am: 5efd02bc63 Alan Viverette 2017-10-18 23:41:24 +0000
  • 5a78cc77ad Merge "Update docs generation to exclude dependency R files" into oc-mr1-support-27.0-dev am: 5efd02bc63 Alan Viverette 2017-10-18 23:41:24 +0000
  • 3463ce235e Merge "Update docs generation to exclude dependency R files" into oc-mr1-support-27.0-dev am: 5efd02bc63 Alan Viverette 2017-10-18 23:41:23 +0000
  • 528ba5357c Merge "Update docs generation to exclude dependency R files" into oc-mr1-support-27.0-dev TreeHugger Robot 2017-10-18 23:36:42 +0000
  • db95f9ad60 [automerger] Merge "Flatfoot rc1 <3" into oc-mr1-support-27.0-dev am: f58555baf0 am: 88a078c8d4 Android Build Merger (Role) 2017-10-18 21:55:55 +0000
  • 7888ec2d6b Merge "Flatfoot rc1 <3" into oc-mr1-support-27.0-dev am: f58555baf0 Yigit Boyar 2017-10-18 21:54:19 +0000
  • b0259656ab Merge "Flatfoot rc1 <3" into oc-mr1-support-27.0-dev am: f58555baf0 Yigit Boyar 2017-10-18 21:54:19 +0000
  • f20404f320 Merge "Flatfoot rc1 <3" into oc-mr1-support-27.0-dev am: f58555baf0 Yigit Boyar 2017-10-18 21:54:15 +0000
  • f4d7a140db Flatfoot rc1 <3 Yigit Boyar 2017-10-18 11:17:23 -0700
  • 183f811201 Update docs generation to exclude dependency R files Alan Viverette 2017-10-18 12:15:44 +0100
  • b3a333913b DO NOT MERGE: Merge commit '6bb6a6b7b2b0316d96c967c36132a1243589c07b' from oc-support-26.0-dev to stage-aosp-master. am: 7b04475001 -s ours am: e6dea41410 -s ours am: 0b7a069c40 -s ours Xin Li 2017-10-17 23:43:47 +0000
  • 377ec28153 DO NOT MERGE: Merge commit '6bb6a6b7b2b0316d96c967c36132a1243589c07b' from oc-support-26.0-dev to stage-aosp-master. am: 7b04475001 -s ours am: e6dea41410 -s ours Xin Li 2017-10-17 23:39:42 +0000
  • 7e2899bb57 DO NOT MERGE: Merge commit '6bb6a6b7b2b0316d96c967c36132a1243589c07b' from oc-support-26.0-dev to stage-aosp-master. am: 7b04475001 -s ours Xin Li 2017-10-17 23:20:32 +0000
  • edd965bc56 DO NOT MERGE: Merge commit '6bb6a6b7b2b0316d96c967c36132a1243589c07b' from oc-support-26.0-dev to stage-aosp-master. Xin Li 2017-10-16 15:45:39 -0700
  • 3114331c2c [automerger] Revert "Create reportModifications task" am: ccb3fcbe7f am: caab179866 Android Build Merger (Role) 2017-10-17 01:42:55 +0000
  • 1f02e3db76 Revert "Create reportModifications task" am: ccb3fcbe7f Sergey Vasilinets 2017-10-17 01:42:02 +0000
  • 388d0f3fc7 [automerger] Merge "Revert "Support buildIds in reportModifications task"" into oc-mr1-support-27.0-dev am: 8ec204c195 am: 3c3092c2ab Android Build Merger (Role) 2017-10-17 01:40:55 +0000
  • 82c9ee8689 Merge "Revert "Support buildIds in reportModifications task"" into oc-mr1-support-27.0-dev am: 8ec204c195 Sergey Vasilinets 2017-10-17 01:39:38 +0000
  • bbd2cc0ead Revert "Create reportModifications task" am: ccb3fcbe7f Sergey Vasilinets 2017-10-17 01:38:58 +0000
  • 9bbcb2db75 Revert "Create reportModifications task" am: ccb3fcbe7f Sergey Vasilinets 2017-10-17 01:38:52 +0000
  • 2d06566ea9 Merge "Revert "Support buildIds in reportModifications task"" into oc-mr1-support-27.0-dev am: 8ec204c195 Sergey Vasilinets 2017-10-17 01:38:15 +0000
  • eacf70ec67 Merge "Revert "Support buildIds in reportModifications task"" into oc-mr1-support-27.0-dev am: 8ec204c195 Sergey Vasilinets 2017-10-17 01:38:10 +0000
  • 31a193fed3 Revert "Create reportModifications task" Sergey Vasilinets 2017-10-16 23:46:48 +0000
  • 809ecc7f26 Merge "Revert "Support buildIds in reportModifications task"" into oc-mr1-support-27.0-dev Sergey Vasilinets 2017-10-16 23:47:53 +0000
  • f05ee98daf Revert "Support buildIds in reportModifications task" Sergey Vasilinets 2017-10-16 23:44:59 +0000
  • ae7a7904b8 [automerger] Add definition for API 26.1.0 am: 8597b330f7 am: dcec51dc05 Android Build Merger (Role) 2017-10-16 17:27:03 +0000
  • 1624718130 Add definition for API 26.1.0 am: 8597b330f7 Alan Viverette 2017-10-16 17:26:14 +0000
  • 609b5478fa Add definition for API 26.1.0 am: 8597b330f7 Alan Viverette 2017-10-16 17:25:15 +0000
  • ae6875e3c8 Add definition for API 26.1.0 am: 8597b330f7 Alan Viverette 2017-10-16 17:24:30 +0000
  • 6d4d2a4df1 Add definition for API 26.1.0 Alan Viverette 2017-10-13 15:23:28 -0400
  • 3bbf061a67 [automerger] Merge "Support buildIds in reportModifications task" into oc-mr1-support-27.0-dev am: 2101230f03 am: 9fcc94e5c4 Android Build Merger (Role) 2017-10-15 02:00:01 +0000
  • 65d86648de Merge "Support buildIds in reportModifications task" into oc-mr1-support-27.0-dev am: 2101230f03 Sergey Vasilinets 2017-10-15 01:59:22 +0000
  • 7871289e69 [automerger] Merge "Bump lifecycle runtime version to 1.0.2" into oc-mr1-support-27.0-dev am: ee737c678b am: 1e2fb4c127 Android Build Merger (Role) 2017-10-15 01:56:08 +0000
  • ed897b61b0 Merge "Bump lifecycle runtime version to 1.0.2" into oc-mr1-support-27.0-dev am: ee737c678b Sergey Vasilinets 2017-10-15 01:55:27 +0000
  • eb09c01c91 [automerger] Merge "Bring back <type>aar</type> hack." into oc-mr1-support-27.0-dev am: 1960166c5d am: 631b7f701f Android Build Merger (Role) 2017-10-15 01:54:10 +0000
  • 1d39c28c2b Merge "Bring back <type>aar</type> hack." into oc-mr1-support-27.0-dev am: 1960166c5d Aurimas Liutikas 2017-10-15 01:53:34 +0000
  • af034cf07c Merge "Support buildIds in reportModifications task" into oc-mr1-support-27.0-dev am: 2101230f03 Sergey Vasilinets 2017-10-15 01:44:30 +0000
  • 87c1f781f5 Merge "Support buildIds in reportModifications task" into oc-mr1-support-27.0-dev am: 2101230f03 Sergey Vasilinets 2017-10-15 01:43:33 +0000
  • 062f9d3d61 [automerger] Merge "Create reportModifications task" into oc-mr1-support-27.0-dev am: 0d5c3f210a am: 19b280d0eb Android Build Merger (Role) 2017-10-15 01:42:15 +0000
  • d38218afd8 Merge "Create reportModifications task" into oc-mr1-support-27.0-dev am: 0d5c3f210a Sergey Vasilinets 2017-10-15 01:41:42 +0000
  • d7543be8af Merge "Bump lifecycle runtime version to 1.0.2" into oc-mr1-support-27.0-dev am: ee737c678b Sergey Vasilinets 2017-10-15 01:41:02 +0000
  • a110cfea5b Merge "Bump lifecycle runtime version to 1.0.2" into oc-mr1-support-27.0-dev am: ee737c678b Sergey Vasilinets 2017-10-15 01:40:56 +0000
  • 2d8eca58a5 Merge "Bring back <type>aar</type> hack." into oc-mr1-support-27.0-dev am: 1960166c5d Aurimas Liutikas 2017-10-15 01:39:43 +0000
  • 335b0b9c2b Merge "Bring back <type>aar</type> hack." into oc-mr1-support-27.0-dev am: 1960166c5d Aurimas Liutikas 2017-10-15 01:39:34 +0000
  • a991c1ccd4 Merge "Create reportModifications task" into oc-mr1-support-27.0-dev am: 0d5c3f210a Sergey Vasilinets 2017-10-15 01:38:36 +0000
  • 669c163389 Merge "Create reportModifications task" into oc-mr1-support-27.0-dev am: 0d5c3f210a Sergey Vasilinets 2017-10-15 01:38:27 +0000
  • 5116b2d574 Support buildIds in reportModifications task Sergey Vasilinets 2017-10-11 14:29:53 -0700
  • 25e61e1dd3 Merge "Bump lifecycle runtime version to 1.0.2" into oc-mr1-support-27.0-dev Sergey Vasilinets 2017-10-14 00:24:51 +0000
  • b8cd6d567c Bump lifecycle runtime version to 1.0.2 Sergey Vasilinets 2017-10-13 14:00:40 -0700