Gitiles
Code Review Sign In
android-review.linaro.org / platform / tools / adt / idea / refs/heads/nougat-mr1.5-release
  1. d3106c4 am 2d615e0e: am 6158b0c8: (-s ours) am d0aaeb05: am 42282d25: Merge ""Build Variants" view is only visible for Gradle-based Android projects." into studio-1.4-dev automerge: 6accd87 automerge: d339ffe by Alex Ruiz · 9 years ago n-iot-preview-4 nougat-bugfix-release nougat-cts-release nougat-dev nougat-dr1-release nougat-mr0.5-release nougat-mr1-cts-release nougat-mr1-dev nougat-mr1-flounder-release nougat-mr1-release nougat-mr1-security-release nougat-mr1-volantis-release nougat-mr1.1-release nougat-mr1.2-release nougat-mr1.3-release nougat-mr1.4-release nougat-mr1.5-release nougat-mr1.6-release nougat-mr1.7-release nougat-mr1.8-release nougat-mr2-dev nougat-mr2-pixel-release nougat-mr2-release nougat-mr2-security-release nougat-mr2.1-release nougat-mr2.2-release nougat-mr2.3-release nougat-release oreo-cts-release oreo-dev oreo-dr1-dev oreo-dr1-release oreo-dr2-release oreo-dr3-release oreo-m2-release oreo-m2-s1-release oreo-m2-s2-release oreo-m2-s3-release oreo-m2-s4-release oreo-m2-s5-release oreo-m3-release oreo-m4-s1-release oreo-m4-s10-release oreo-m4-s11-release oreo-m4-s12-release oreo-m4-s2-release oreo-m4-s3-release oreo-m4-s4-release oreo-m4-s5-release oreo-m4-s6-release oreo-m4-s7-release oreo-m4-s8-release oreo-m4-s9-release oreo-m5-release oreo-m6-s2-release oreo-m6-s3-release oreo-m6-s4-release oreo-m7-release oreo-m8-release oreo-mr1-cts-release oreo-mr1-cuttlefish-testing oreo-mr1-dev oreo-mr1-release oreo-mr1-s1-release oreo-mr1-security-release oreo-mr1-vts-release oreo-mr1-wear-release oreo-r2-release oreo-r3-release oreo-r4-release oreo-r5-release oreo-r6-release oreo-release oreo-security-release oreo-vts-release security-oc-mr1-release security-oc-release android-7.0.0_r1 android-7.0.0_r10 android-7.0.0_r11 android-7.0.0_r12 android-7.0.0_r13 android-7.0.0_r14 android-7.0.0_r15 android-7.0.0_r17 android-7.0.0_r19 android-7.0.0_r21 android-7.0.0_r24 android-7.0.0_r27 android-7.0.0_r28 android-7.0.0_r29 android-7.0.0_r3 android-7.0.0_r30 android-7.0.0_r31 android-7.0.0_r32 android-7.0.0_r33 android-7.0.0_r34 android-7.0.0_r35 android-7.0.0_r36 android-7.0.0_r4 android-7.0.0_r5 android-7.0.0_r6 android-7.0.0_r7 android-7.0.0_r8 android-7.0.0_r9 android-7.1.0_r1 android-7.1.0_r2 android-7.1.0_r3 android-7.1.0_r4 android-7.1.0_r5 android-7.1.0_r6 android-7.1.0_r7 android-7.1.1_r1 android-7.1.1_r10 android-7.1.1_r11 android-7.1.1_r12 android-7.1.1_r13 android-7.1.1_r14 android-7.1.1_r15 android-7.1.1_r16 android-7.1.1_r17 android-7.1.1_r2 android-7.1.1_r20 android-7.1.1_r21 android-7.1.1_r22 android-7.1.1_r23 android-7.1.1_r24 android-7.1.1_r25 android-7.1.1_r26 android-7.1.1_r27 android-7.1.1_r28 android-7.1.1_r3 android-7.1.1_r31 android-7.1.1_r32 android-7.1.1_r33 android-7.1.1_r35 android-7.1.1_r38 android-7.1.1_r39 android-7.1.1_r4 android-7.1.1_r40 android-7.1.1_r41 android-7.1.1_r42 android-7.1.1_r43 android-7.1.1_r44 android-7.1.1_r45 android-7.1.1_r46 android-7.1.1_r47 android-7.1.1_r48 android-7.1.1_r49 android-7.1.1_r50 android-7.1.1_r51 android-7.1.1_r52 android-7.1.1_r53 android-7.1.1_r54 android-7.1.1_r55 android-7.1.1_r56 android-7.1.1_r57 android-7.1.1_r58 android-7.1.1_r59 android-7.1.1_r6 android-7.1.1_r60 android-7.1.1_r61 android-7.1.1_r7 android-7.1.1_r8 android-7.1.1_r9 android-7.1.2_r1 android-7.1.2_r10 android-7.1.2_r11 android-7.1.2_r12 android-7.1.2_r13 android-7.1.2_r14 android-7.1.2_r15 android-7.1.2_r16 android-7.1.2_r17 android-7.1.2_r18 android-7.1.2_r19 android-7.1.2_r2 android-7.1.2_r23 android-7.1.2_r24 android-7.1.2_r25 android-7.1.2_r27 android-7.1.2_r28 android-7.1.2_r29 android-7.1.2_r3 android-7.1.2_r30 android-7.1.2_r32 android-7.1.2_r33 android-7.1.2_r36 android-7.1.2_r37 android-7.1.2_r38 android-7.1.2_r39 android-7.1.2_r4 android-7.1.2_r5 android-7.1.2_r6 android-7.1.2_r8 android-7.1.2_r9 android-8.0.0_r1 android-8.0.0_r10 android-8.0.0_r11 android-8.0.0_r12 android-8.0.0_r13 android-8.0.0_r15 android-8.0.0_r16 android-8.0.0_r17 android-8.0.0_r2 android-8.0.0_r21 android-8.0.0_r22 android-8.0.0_r23 android-8.0.0_r24 android-8.0.0_r25 android-8.0.0_r26 android-8.0.0_r27 android-8.0.0_r28 android-8.0.0_r29 android-8.0.0_r3 android-8.0.0_r30 android-8.0.0_r31 android-8.0.0_r32 android-8.0.0_r33 android-8.0.0_r34 android-8.0.0_r35 android-8.0.0_r36 android-8.0.0_r37 android-8.0.0_r38 android-8.0.0_r39 android-8.0.0_r4 android-8.0.0_r40 android-8.0.0_r41 android-8.0.0_r42 android-8.0.0_r43 android-8.0.0_r44 android-8.0.0_r45 android-8.0.0_r46 android-8.0.0_r47 android-8.0.0_r48 android-8.0.0_r49 android-8.0.0_r50 android-8.0.0_r51 android-8.0.0_r7 android-8.0.0_r9 android-8.1.0_r1 android-8.1.0_r10 android-8.1.0_r11 android-8.1.0_r12 android-8.1.0_r13 android-8.1.0_r14 android-8.1.0_r15 android-8.1.0_r16 android-8.1.0_r17 android-8.1.0_r18 android-8.1.0_r19 android-8.1.0_r2 android-8.1.0_r20 android-8.1.0_r21 android-8.1.0_r22 android-8.1.0_r23 android-8.1.0_r25 android-8.1.0_r26 android-8.1.0_r27 android-8.1.0_r28 android-8.1.0_r29 android-8.1.0_r3 android-8.1.0_r30 android-8.1.0_r31 android-8.1.0_r32 android-8.1.0_r33 android-8.1.0_r35 android-8.1.0_r36 android-8.1.0_r37 android-8.1.0_r38 android-8.1.0_r39 android-8.1.0_r4 android-8.1.0_r40 android-8.1.0_r41 android-8.1.0_r42 android-8.1.0_r43 android-8.1.0_r45 android-8.1.0_r46 android-8.1.0_r47 android-8.1.0_r48 android-8.1.0_r5 android-8.1.0_r50 android-8.1.0_r51 android-8.1.0_r52 android-8.1.0_r53 android-8.1.0_r6 android-8.1.0_r60 android-8.1.0_r61 android-8.1.0_r62 android-8.1.0_r63 android-8.1.0_r64 android-8.1.0_r65 android-8.1.0_r66 android-8.1.0_r67 android-8.1.0_r68 android-8.1.0_r69 android-8.1.0_r7 android-8.1.0_r70 android-8.1.0_r71 android-8.1.0_r72 android-8.1.0_r73 android-8.1.0_r74 android-8.1.0_r75 android-8.1.0_r76 android-8.1.0_r77 android-8.1.0_r78 android-8.1.0_r79 android-8.1.0_r8 android-8.1.0_r80 android-8.1.0_r81 android-8.1.0_r9 android-cts-7.0_r1 android-cts-7.0_r10 android-cts-7.0_r11 android-cts-7.0_r12 android-cts-7.0_r13 android-cts-7.0_r14 android-cts-7.0_r15 android-cts-7.0_r16 android-cts-7.0_r17 android-cts-7.0_r18 android-cts-7.0_r19 android-cts-7.0_r2 android-cts-7.0_r20 android-cts-7.0_r21 android-cts-7.0_r22 android-cts-7.0_r23 android-cts-7.0_r24 android-cts-7.0_r25 android-cts-7.0_r26 android-cts-7.0_r27 android-cts-7.0_r28 android-cts-7.0_r29 android-cts-7.0_r3 android-cts-7.0_r30 android-cts-7.0_r31 android-cts-7.0_r32 android-cts-7.0_r33 android-cts-7.0_r4 android-cts-7.0_r5 android-cts-7.0_r6 android-cts-7.0_r7 android-cts-7.0_r8 android-cts-7.0_r9 android-cts-7.1_r1 android-cts-7.1_r10 android-cts-7.1_r11 android-cts-7.1_r12 android-cts-7.1_r13 android-cts-7.1_r14 android-cts-7.1_r15 android-cts-7.1_r16 android-cts-7.1_r17 android-cts-7.1_r18 android-cts-7.1_r19 android-cts-7.1_r2 android-cts-7.1_r20 android-cts-7.1_r21 android-cts-7.1_r22 android-cts-7.1_r23 android-cts-7.1_r24 android-cts-7.1_r25 android-cts-7.1_r26 android-cts-7.1_r27 android-cts-7.1_r28 android-cts-7.1_r29 android-cts-7.1_r3 android-cts-7.1_r4 android-cts-7.1_r5 android-cts-7.1_r6 android-cts-7.1_r7 android-cts-7.1_r8 android-cts-7.1_r9 android-cts-8.0_r1 android-cts-8.0_r10 android-cts-8.0_r11 android-cts-8.0_r12 android-cts-8.0_r13 android-cts-8.0_r14 android-cts-8.0_r15 android-cts-8.0_r16 android-cts-8.0_r17 android-cts-8.0_r18 android-cts-8.0_r19 android-cts-8.0_r2 android-cts-8.0_r20 android-cts-8.0_r21 android-cts-8.0_r22 android-cts-8.0_r23 android-cts-8.0_r24 android-cts-8.0_r25 android-cts-8.0_r26 android-cts-8.0_r3 android-cts-8.0_r4 android-cts-8.0_r5 android-cts-8.0_r6 android-cts-8.0_r7 android-cts-8.0_r8 android-cts-8.0_r9 android-cts-8.1_r1 android-cts-8.1_r10 android-cts-8.1_r11 android-cts-8.1_r12 android-cts-8.1_r13 android-cts-8.1_r14 android-cts-8.1_r15 android-cts-8.1_r16 android-cts-8.1_r17 android-cts-8.1_r18 android-cts-8.1_r19 android-cts-8.1_r2 android-cts-8.1_r20 android-cts-8.1_r21 android-cts-8.1_r22 android-cts-8.1_r23 android-cts-8.1_r24 android-cts-8.1_r25 android-cts-8.1_r3 android-cts-8.1_r4 android-cts-8.1_r5 android-cts-8.1_r6 android-cts-8.1_r7 android-cts-8.1_r8 android-cts-8.1_r9 android-cts_7.1_r1 android-n-iot-preview-4 android-n-mr1-preview-1 android-n-mr1-preview-2 android-n-mr2-preview-1 android-n-mr2-preview-2 android-o-mr1-preview-1 android-o-mr1-preview-2 android-o-preview-2 android-o-preview-3 android-o-preview-4 android-security-8.0.0_r52 android-security-8.0.0_r53 android-security-8.0.0_r54 android-security-8.1.0_r82 android-security-8.1.0_r83 android-security-8.1.0_r84 android-security-8.1.0_r85 android-security-8.1.0_r86 android-security-8.1.0_r87 android-security-8.1.0_r88 android-security-8.1.0_r89 android-security-8.1.0_r90 android-security-8.1.0_r91 android-security-8.1.0_r92 android-security-8.1.0_r93 android-vts-8.0_r1 android-vts-8.0_r10 android-vts-8.0_r11 android-vts-8.0_r12 android-vts-8.0_r13 android-vts-8.0_r2 android-vts-8.0_r6 android-vts-8.0_r7 android-vts-8.0_r8 android-vts-8.0_r9 android-vts-8.1_r10 android-vts-8.1_r11 android-vts-8.1_r12 android-vts-8.1_r13 android-vts-8.1_r14 android-vts-8.1_r3 android-vts-8.1_r4 android-vts-8.1_r5 android-vts-8.1_r6 android-vts-8.1_r7 android-vts-8.1_r8 android-vts-8.1_r9 android-wear-8.1.0_r1 android-wear-o-preview-3 android-wear-o-preview-4
  2. 8b452f94 am 29b51ba5: am cfc41115: (-s ours) am b4bf5018: am acf3114f: Merge ""Gradle Sync" action is only visible for Gradle projects." into studio-1.4-dev automerge: 5316b76 automerge: 9deb3a3 by Alex Ruiz · 9 years ago
  3. a1b1813 am e0c8330a: am e66f8717: (-s ours) am 913cd98d: am e715ac6c: Merge "Removed checks for null that introduced bug." into studio-1.4-dev automerge: a58b9f6 automerge: 82178ea by Alex Ruiz · 9 years ago
  4. be9ae46 am 306965bc: am dbfda275: (-s ours) am 13b8fdbd: am 6a45bd5f: Merge "Hide file name in state list picker location panel" into studio-1.4-dev automerge: 2cdeb5e automerge: b5b5ca8 by Jerome Gaillard · 9 years ago
  5. c857021 am 93df689e: am c5cc6611: (-s ours) am 3bcf6c5d: am 8e4f1d30: Merge "Pass in throwable when calling Log.error" into studio-1.4-dev automerge: 13a9226 automerge: e2e100d by Siva Velusamy · 9 years ago
  6. 623f650 am 29149309: am 27d03647: (-s ours) am 11e0f661: am e76c916a: Merge "Only setting height to 1 when we are reducing the width" into studio-1.4-dev automerge: 3bc9319 automerge: f86bb57 by Diego Perez · 9 years ago
  7. e13b9d3 am 603faf49: am 796b4ee2: (-s ours) am 8d54ca7c: am 566a6095: Merge "Avoid crash in new SDK preview" into studio-1.4-dev automerge: 94cb585 automerge: e1b87b9 by Diego Perez · 9 years ago
  8. b464ce3 am 7680a4a3: am 3399d618: (-s ours) am 72b47342: am 9ab04059: Merge "Regenerate sources/mockable jars on project rebuild." into studio-1.4-dev automerge: ffcf4b0 automerge: 09ca8a3 by Michal Bendowski · 9 years ago
  9. 3a4469f am 00ed826a: am 032e3a75: (-s ours) am e6bd1368: am cf17ceb6: Merge "Implement Gradle aware add jetBrains annotation fix." into studio-1.4-dev automerge: 0e32883 automerge: a754c33 by Fuyao Zhao · 9 years ago
  10. 72f6ad9 am 7f29e386: am 30175677: (-s ours) am 0aade84f: am 6e7164db: Merge "Implement Gradle awared \'Add JUnit dependency\' quick fix" into studio-1.4-dev automerge: 2e6ab42 automerge: 8bd7cc6 by Fuyao Zhao · 9 years ago
  11. d90bbd7 am fc1df542: am 96b9118c: (-s ours) am 5897882a: am bcc4efa6: Merge "Add module dep quickfix will correctly consider the type of module. Don\'t generate source when doing gradle sync." into studio-1.4-dev automerge: f460715 automerge: 63815e7 by Fuyao Zhao · 9 years ago
  12. f7fa9ab am 8c531bc2: am c438730f: (-s ours) am 2e6bdf60: am a26f90be: Merge "Undo gradle awared quickfix would be able to automatically trigger gradle sync" into studio-1.4-dev automerge: 438da09 automerge: 4ea4d02 by Fuyao Zhao · 9 years ago
  13. 7f8a27b am e6c94861: am 4927d2eb: (-s ours) am 69279936: am 57f67ee0: Merge "Implement gradle aware \'Add library depedency\'." into studio-1.4-dev automerge: bf7d61f automerge: 42dc035 by Fuyao Zhao · 9 years ago
  14. 40a1708 am 60ee92a9: am d78e1a0f: (-s ours) am 6ecdfeee: am bc5daa9e: Merge "Fix UI of configuration toolbar" into studio-1.4-dev automerge: a829377 automerge: 2b8c30c by Jerome Gaillard · 9 years ago
  15. 4734358 am 42c50494: am a3f1f023: (-s ours) am eb2cca3c: am 24110c3f: Merge "Add checks for existence of entries in tree before scrolling." into studio-1.4-dev automerge: 0fc1ad3 automerge: f66ef3c by Chester Hsieh · 9 years ago
  16. 90b73fc am f069ffc2: am 7a6f590b: (-s ours) am 3cce74c0: am 1b1595cc: Merge "resolve merge conflicts of f77256e to studio-1.4-dev." into studio-1.4-dev automerge: 7aa8c13 automerge: 073b61f by Siva Velusamy · 9 years ago
  17. 85a8301 am 51e0e94d: am 6c09071b: (-s ours) am 77c9a57c: am d815dbb0: Merge "Fix IndexNotReadyException in layout editor" into studio-1.4-dev automerge: 9f218ff automerge: 7b5c3b4 by Andrew Shulaev · 9 years ago
  18. e3f1b9f am 7d99d811: am 88abb20e: (-s ours) am eff6b9a0: am d9502968: Merge "Migrate some clients to getMainArtifact." into studio-1.4-dev automerge: cb4c135 automerge: b97d32c by Alex Ruiz · 9 years ago
  19. 19a8dc1 am fe039e6a: am e41f0291: (-s ours) am 5ca4b6c0: am f73d9f19: Merge "Implement current source provider methods." into studio-1.4-dev automerge: ed3f379 automerge: 7dca8b9 by Alex Ruiz · 9 years ago
  20. f8972a9 am eb200830: am 1c8e98f2: (-s ours) am 12d6d3e9: am 915ca316: Merge "Change gradle\'s language setting when trigger language level change quick fix" into studio-1.4-dev automerge: 79a69f4 automerge: 4b57c94 by Fuyao Zhao · 9 years ago
  21. aa530d8 am f561bda0: am 461c1bb7: (-s ours) am 145db7b4: am 8dd34fa8: Merge "Fixing creation of wear AVDs on windows" into studio-1.3-dev automerge: 240238f automerge: d0aa6f6 automerge: 118d8d5 by Tor Norbye · 9 years ago
  22. 5385d20 am 4506bb0e: am 8b97769c: (-s ours) am 6ecab90c: am 9c05160c: Merge "Implemented some of GridDragHandler.paint" into studio-1.4-dev automerge: 6781757 automerge: cd97958 by Juan Nuno · 9 years ago
  23. 2ad3fd3 am 4e57c162: am 9beb5c5d: (-s ours) am 4908a6ae: am 60784273: Merge "Comments about invokeLater and code cleaning" into studio-1.4-dev automerge: 405f653 automerge: 7e373bb by Jerome Gaillard · 9 years ago
  24. 7736435 am 4afa0a6e: am 80b98355: (-s ours) am 40bd19bc: am 7eb0a966: Merge "Move the vector drawble conversion/preview library from asset lib to sdk-common" into studio-1.4-dev automerge: 9115474 automerge: bc4faaa by Tenghui Zhu · 9 years ago
  25. 9ae34dc am 1330fa42: am e922cae9: (-s ours) am 47c8c50a: am 37196391: Merge "Fix IndexNotReadyException in layout editor" into studio-1.4-dev automerge: 477ea69 automerge: c686f09 by Andrew Shulaev · 9 years ago
  26. dfd7872 am 812a7f24: am 20177c24: (-s ours) am b5287850: am f008e77a: Merge "181789: Incorrect/inconsistent lint + documentation for Snackbar" into studio-1.4-dev automerge: 9419115 automerge: 2c781f7 by Tor Norbye · 9 years ago
  27. 8d1f0af am 482995ff: am 4e804afa: (-s ours) am b0bcfa7e: am 90ea4e59: Merge "Implement IdeaAndroidProject#getAllSourceProviders" into studio-1.4-dev automerge: f3dbe41 automerge: 4120b18 by Alex Ruiz · 9 years ago
  28. 966e35a am c5b14bd4: am e6a4fdb2: (-s ours) am 5155b57b: am b2fb7c3e: Merge "Removed duplicated method implementation." into studio-1.4-dev automerge: 06e4f0a automerge: 595adfe by Alex Ruiz · 9 years ago
  29. e558715 am 73b6d3cd: am 397ebb0f: (-s ours) am d2c64a51: am b30152d4: Merge "Rebuild the preview when design components are detected" into studio-1.4-dev automerge: a54c5c4 automerge: aa6f655 by Diego Perez · 9 years ago
  30. 5cb8413 am bcebc197: am e38c3ca8: (-s ours) am 67c7e1f3: am 4a6b9477: Merge "resolve merge conflicts of 245ed49 to studio-1.4-dev." into studio-1.4-dev automerge: d0a7dfb automerge: 1c50128 by Tor Norbye · 9 years ago
  31. e7392cc am 172f80ec: am f0b8878c: (-s ours) am 3695d7a2: am d675d774: Merge "Removed check for writable access to Android SDK location." into studio-1.3-dev automerge: a275126 automerge: a11cd8d automerge: 67bf4e2 by Alex Ruiz · 9 years ago
  32. f398e4f am 84ccca75: am 176ba6ee: (-s ours) am d6fe70cb: am 49cbb38d: Merge "resolve merge conflicts of d6ece83 to studio-1.4-dev." into studio-1.4-dev automerge: 8d912d1 automerge: 6ae2dab by Tor Norbye · 9 years ago
  33. 6a94b44 am 4827508b: am 7d025240: (-s ours) am 9703be4c: am 6d957562: Merge "Fix simple mode sorting and UI tests" into studio-1.4-dev automerge: 74e54a7 automerge: e8239b0 by Diego Perez · 9 years ago
  34. 6fa7e0e am 957af89a: am 718a42c7: (-s ours) am 049ca9bc: am 8e380270: Merge "resolve merge conflicts of 51ec685 to studio-1.4-dev." into studio-1.4-dev automerge: 5fc0f1d automerge: 1b1dd8a by Tor Norbye · 9 years ago
  35. fa7c489 am 4d909fca: am 46984bef: (-s ours) am 380c8612: am 15c0ae4b: Merge "Update builder-model to 1.3.0" into studio-1.3-dev automerge: 47eef8b automerge: e5c2d67 automerge: 54ce143 by Tor Norbye · 9 years ago
  36. a6ade21 am d6c5882c: am 22fc4c72: (-s ours) am a3605d1d: am ebcc08ec: Merge "Fixing error when haxm installer doesn\'t return revision" into studio-1.3-dev automerge: 007dfca automerge: 27ba2e0 automerge: e4cadeb by Tor Norbye · 9 years ago
  37. ee8c4bc am b23d3e73: am 8ab4c0c8: (-s ours) am 52cf494d: am 15df44c6: Merge "Fix NoClassDefFoundError during rendering." into studio-1.3-dev automerge: b749557 automerge: f830c6f automerge: a7feb81 by Tor Norbye · 9 years ago
  38. 13a233d am da8e9892: am 07add85e: (-s ours) am 66942557: am d09275b6: Merge "Logcat no longer discards last dead client" into studio-1.3-dev automerge: b3e3c82 automerge: 64d3e45 automerge: f3decb1 by Esteban de la Canal · 9 years ago
  39. 07d6d64 am a9f1274c: am ce5e9a5e: (-s ours) am af1f7c86: am 12908b01: Merge "resolve merge conflicts of aca158a to studio-1.4-dev." into studio-1.4-dev automerge: c828d49 automerge: e48e380 by Tor Norbye · 9 years ago
  40. 324c335 am 6184965c: am 85dc9c83: (-s ours) am 0cf74f01: am 2dbbcff1: Merge "Fix failing testGenerateToolTipText" into studio-1.4-dev automerge: 6cee7dd automerge: b152af2 by Andrew Shulaev · 9 years ago
  41. 5535160 am e1f8097d: am 9d15e8b7: (-s ours) am 25bae2c3: am 6db97ec8: Merge "resolve merge conflicts of eaefb40 to studio-1.4-dev." into studio-1.4-dev automerge: d71f455 automerge: db6b680 by Michal Bendowski · 9 years ago
  42. 5481478 am 5d2854d1: am 486b868e: (-s ours) am 02397bb0: am 3e90745c: Merge "b/22628881: Tweak toolbar wording" into studio-1.3-dev automerge: 25bc518 automerge: f9a3774 automerge: 017e1e7 by Tor Norbye · 9 years ago
  43. 9807c40 am 2ce3a976: am 7d4b680e: (-s ours) am 14d29d16: am aa8ae4c2: Merge "Working around issue in string encoding in hprof files." into studio-1.3-dev automerge: 3e4c7e1 automerge: 8fbbcdd automerge: 487a717 by Esteban de la Canal · 9 years ago
  44. 2dad26a am 18f43342: am b596849b: (-s ours) am 2e1cf840: am 408227a7: Merge "resolve merge conflicts of 86bd093 to studio-1.4-dev." into studio-1.4-dev automerge: 554acd7 automerge: 0cc1b93 by Chester Hsieh · 9 years ago
  45. ac4d157 am 14830148: am 9ac45b8b: (-s ours) am 5281e150: am 4cbe9fa1: Merge "Semi-fixing GTK+ issue in sdk manager" into studio-1.4-dev automerge: a0d7421 automerge: 98b412c by Joe Baker-Malone · 9 years ago
  46. 09c34c8 am 70359d4c: am 24494c03: (-s ours) am 58436f40: am 7c669715: Merge "Use getDefaultSourceProvider where possible." into studio-1.4-dev automerge: 4be5595 automerge: fb6cb23 by Alex Ruiz · 9 years ago
  47. 645379e am bc7181b5: am a1aa7044: (-s ours) am 947e087f: am e193d168: Merge "Implement IdeaAndroidProject#getTargetSdkVersion." into studio-1.4-dev automerge: bfb179a automerge: 291e6d0 by Alex Ruiz · 9 years ago
  48. c2609f9 am ee92040e: am 159e8aec: (-s ours) am 81b1bc3d: am 7db90703: Merge "Migrate min-SDK accessor to interface method." into studio-1.4-dev automerge: 22e1ba7 automerge: 857903b by Alex Ruiz · 9 years ago
  49. 967b51b am 45ad5ef9: am d989ca95: (-s ours) am 20d4f66a: am 98bd7b41: Merge "Use SDK version check rather than @TargetApi for API warnings" into studio-1.4-dev automerge: b9c994b automerge: 0ad91ee by Tor Norbye · 9 years ago
  50. a3ae507 am c4a50a24: am e3258f83: (-s ours) am b10f702e: am b86f2e9e: Merge "Implement IdeaAndroidProject#isDebuggable" into studio-1.4-dev automerge: 76a288a automerge: ae2f1f2 by Alex Ruiz · 9 years ago
  51. daa155b am a8bc544d: am 93678aff: (-s ours) am 6abeb6c0: am 39229b5e: Merge "Implement getAllApplicationIds, use it in chooser." into studio-1.4-dev automerge: 3c820fd automerge: 5917a04 by Alex Ruiz · 9 years ago
  52. d732050 am 1a340099: am 6e77cc9e: (-s ours) am 39c620c2: am 153d46c0: Merge "Move computePackageName calls to getApplicationId." into studio-1.4-dev automerge: ffcd440 automerge: 92e6e3a by Alex Ruiz · 9 years ago
  53. 3c90f2a am d58d23b1: am dbc3741f: (-s ours) am 72f6bc52: am 69eaf06c: Merge "Catch an exception if user deletes file and editor hasn\'t synced yet." into studio-1.4-dev automerge: 82343e6 automerge: 0f904f9 by Chester Hsieh · 9 years ago
  54. bb3b784 am 34799eed: am 45dbad67: (-s ours) am daae90db: am 473ea4d5: Merge "Trivially implement AndroidModel interface." into studio-1.4-dev automerge: 5796c79 automerge: 6b9a03d by Alex Ruiz · 9 years ago
  55. ae67b78 am c5942d54: am 52133abe: (-s ours) am 93c31d51: am 05ba9998: Merge "Reset value only shown when value can actually be reset." into studio-1.4-dev automerge: cd9fb58 automerge: b34f870 by Yura · 9 years ago
  56. 7d51957 am 7e68b22a: am 3fc05a6a: (-s ours) am 63476e4c: am 69001aea: Merge "Draft a generic AndroidModel interface." into studio-1.4-dev automerge: 1e88256 automerge: 5723e1e by Alex Ruiz · 9 years ago
  57. 8a6f5be am a4b559f7: am 4e48c66a: (-s ours) am bae10432: am 690756d9: Merge "Added extension point to handle build-system-independent project syncs after a SDK path change." into studio-1.4-dev automerge: 898096b automerge: 43e3998 by Alex Ruiz · 9 years ago
  58. 9f6f39d am 8a5c362e: am 88fd8edc: (-s ours) am e26fdbb1: am a2135a1d: Merge "Remove warnings from ThemeEditorStyle" into studio-1.4-dev automerge: 0ce4462 automerge: 8046f97 by Diego Perez · 9 years ago
  59. dfa9d81 am 79ec89ab: am 955095ea: (-s ours) am 99676c0c: am 6737d5bd: Merge "Use proper ThemeResolver in tests of resolveAllAttributes" into studio-1.4-dev automerge: 520de3f automerge: cdd3c27 by Andrew Shulaev · 9 years ago
  60. 628f7d1 am 69e6c7d2: am 7ce7fa02: (-s ours) am 961eee5d: am 84b122e8: Merge "Fix some Nele tests that are failing on Jenkins." into studio-1.4-dev automerge: bc7cbbe automerge: 6710c9e by Jens Ole Lauridsen · 9 years ago
  61. fad2175 am cea94622: am b914f5d4: (-s ours) am 4354a047: am 17dfd0eb: Merge "Android framework detection is not suppressed on projects that use an Android model." into studio-1.4-dev automerge: ea8f4ed automerge: 2bd4339 by Alex Ruiz · 9 years ago
  62. ab889bd am a1e2fd3a: am 4c685659: (-s ours) am b1be1c4a: am fbdb354f: Merge "Use Disposer.dispose() instead of directly calling dispose()" into studio-1.4-dev automerge: 10523c7 automerge: 0dd4fca by Siva Velusamy · 9 years ago
  63. 4687491 am fd103ab0: am 5e57b566: (-s ours) am aeab6fd3: am 830589ef: Merge "Show lint errors on the design surface" into studio-1.4-dev automerge: 79ff64a automerge: 788cc55 by Siva Velusamy · 9 years ago
  64. a10246f am bab1e48d: am 2ccee7c6: (-s ours) am d1c48921: am e658dc09: Merge "Extend run configuration with activity extra flags field." into studio-1.4-dev automerge: c479bf6 automerge: 7abcb97 by Oleksiy Vyalov · 9 years ago
  65. 3d9b384 am 7d02918e: am 157d0d7e: (-s ours) am fe313365: am 1bba98fd: Merge "Relax requirement of getAllParents, add couple of javadoc comments" into studio-1.4-dev automerge: 7fb48bd automerge: 9299ca7 by Andrew Shulaev · 9 years ago
  66. 18e4558 am 0acd38aa: am 86bef3c7: (-s ours) am 0cfa4173: am 4cdb7d47: Merge "Nele: Add dependency checks for palette." into studio-1.4-dev automerge: 0eb409c automerge: ad2b731 by Jens Ole Lauridsen · 9 years ago
  67. b1aa3a3 am 7a62ff93: am 4d0acb91: (-s ours) am eda1d366: am f7cde2b4: Merge "Fix test to pass on Windows." into studio-1.4-dev automerge: e54967a automerge: efaea37 by Renaud Paquay · 9 years ago
  68. 9156368 am 46ef0f35: am 538cd45a: (-s ours) am a5b69aef: am fa635b95: Merge changes I8d00025d,I5fee2bc5 into studio-1.4-dev automerge: f0c45a1 automerge: e43e7b0 by Joe Baker-Malone · 9 years ago
  69. dd15c64 am 46732275: am 28559ac1: (-s ours) am 96e4fd6e: am 3c83c957: Merge "Fix parents resolution for themes which parent reside in another module" into studio-1.4-dev automerge: 17f2be7 automerge: 7f8f76e by Andrew Shulaev · 9 years ago
  70. 1a3194f am 64aeda02: am 263e36a4: (-s ours) am c3d5bd20: am 905e312f: Merge "Better default names in Theme Editor\'s color picker" into studio-1.4-dev automerge: 49edc55 automerge: 39cc4a0 by Andrew Shulaev · 9 years ago
  71. bb5cdb7 am 586296b9: am b81293ef: (-s ours) am 068fd516: am d8048d5d: Merge "Extract a gradleSyncAndImportClass method into GradleDependencyFix class so that other quickfixes could reuse it." into studio-1.4-dev automerge: d19e1b8 automerge: a2c1a81 by Fuyao Zhao · 9 years ago
  72. 6eeadab am 0ce82ecb: am 87d5a617: (-s ours) am e75215b1: am 033d6e84: Merge "Fixing links in first run wizard" into studio-1.4-dev automerge: c1bb602 automerge: 861141a by Joe Baker-Malone · 9 years ago
  73. fda64f9 am 7caa91b8: am 570bc999: (-s ours) am 972720bd: am 2ff8b3ee: Merge "When the width is increasing, reset height" into studio-1.4-dev automerge: 016ea7c automerge: afdbb91 by Diego Perez · 9 years ago
  74. 5ee0b67 am e5fd6968: am 26dcb2b4: (-s ours) am 45f410b8: am edc1d9ae: Merge "Fix Color and Drawable cell colors" into studio-1.4-dev automerge: e2ac326 automerge: 02ba7fd by Diego Perez · 9 years ago
  75. c31215c am a9d6ea07: am 2dacd4ac: (-s ours) am b2f1c8f8: am fa0ed743: Merge "Darker background in theme editor preview on Darcula" into studio-1.4-dev automerge: f7c693c automerge: 8ec1123 by Andrew Shulaev · 9 years ago
  76. 7ae42cb am c4d30a12: am 66711a5b: (-s ours) am 7bbb6f75: am e8e88e86: Merge "Add a Theme Editor test for multiple module support" into studio-1.4-dev automerge: 84216a9 automerge: b237250 by Andrew Shulaev · 9 years ago
  77. 97a8f99 am 310ec94a: am 6287e7d1: (-s ours) am 70fa3b78: am a5a8ad71: Merge "Missing changes for dependency layer." into studio-1.4-dev automerge: 8f767d6 automerge: be86fb6 by Jens Ole Lauridsen · 9 years ago
  78. 81d5158 am 3adccbbf: am ee0afc39: (-s ours) am 8e2ac6f7: am 2cd12d65: Merge "Remove duplicated getTestInstrumentationRunnerArguments method" into studio-1.4-dev automerge: d041015 automerge: 285b2eb by Andrew Shulaev · 9 years ago
  79. 8f645e6 am 91b1fe10: am ce6a682a: (-s ours) am f44eb582: am bc1454b2: Merge "Fix theme attribute resolution" into studio-1.4-dev automerge: b05a020 automerge: 3857a07 by Diego Perez · 9 years ago
  80. 2335f5e am 1214f196: am fcc074db: (-s ours) am 43021d1e: am d02af891: Merge "Fix toolbar definition to use the correct colors" into studio-1.4-dev automerge: b156678 automerge: c33cebe by Diego Perez · 9 years ago
  81. 6ca2063 am 1a2ba70b: am fdcc7774: (-s ours) am b6323440: am d6f38fde: Merge "Stubbed getTestInstrumentationRunnerArguments" into studio-1.4-dev automerge: 2af47f0 automerge: b7a4651 by Juan Nuno · 9 years ago
  82. 009aee7 am bc70ccef: am bc4a5ab4: (-s ours) am 071dda77: am 69f7b643: Merge "Add a build system independent layer for checking dependencies." into studio-1.4-dev automerge: 6ad5299 automerge: d828634 by Jens Ole Lauridsen · 9 years ago
  83. f17c8a1 am 0d3c6eb7: am bb913cf5: (-s ours) am 6c920069: am fe3cc38a: Merge "Nele: Fix the disposing of the palette and structure pane." into studio-1.4-dev automerge: bbda85e automerge: 3aac648 by Jens Ole Lauridsen · 9 years ago
  84. b6d52dd am 2fa0ca6d: am ae257861: (-s ours) am 9fa8e517: am 0ef3933c: Merge "Nele: Resize of child in Relative Layout gives garbage in layout file." into studio-1.4-dev automerge: 3dcfadf automerge: a3b8498 by Jens Ole Lauridsen · 9 years ago
  85. 07a1ef5 am 46d19e94: am b53e5ead: (-s ours) am 02344a15: am bd75b94a: Merge "Developer services are hidden if project isn\'t backed by gradle" into studio-1.4-dev automerge: 3dea1ad automerge: 4a6e1e1 by David Herman · 9 years ago
  86. 6706db8 am a69352e2: am e15d8e36: (-s ours) am 43375c68: am ac6e1e10: Merge "Nele: Use NlModel.addComponents for drag/drop in InteractionManager." into studio-1.4-dev automerge: 1eb956a automerge: b14b636 by Jens Ole Lauridsen · 9 years ago
  87. 83d6b06 am c93d7e4f: am 6606093c: (-s ours) am 38d6b9a9: am 1ef5c613: Merge "Ignore the dependencies from java modules to android modules" into studio-1.4-dev automerge: e2ef3f0 automerge: 0d87101 by Fuyao Zhao · 9 years ago
  88. 6444eaa am 94554024: am 07b47033: (-s ours) am 6025c842: am a781780b: Merge "Disable all FindJarFix for android modules" into studio-1.4-dev automerge: 7b2a47c automerge: e4c673b by Fuyao Zhao · 9 years ago
  89. 1bc2c48 am fa4a6221: am 89d3f108: (-s ours) am cafaf3fa: am 1b2405e6: Merge "Allow tweaking size, alpha and auto mirror in the UI." into studio-1.4-dev automerge: 449f7e4 automerge: 5a39bcf by Tenghui Zhu · 9 years ago
  90. 7c01657 am d2042854: am 93fa9539: (-s ours) am 5fd767ec: am fadc2de8: Merge "Gradle now the authority for developer service installed state" into studio-1.4-dev automerge: 733fc05 automerge: 6ebc67c by David Herman · 9 years ago
  91. e01d3d4 am c26efd77: am ec1b114c: (-s ours) am cb52274e: am 3f053ca8: Merge "Fix compilation error." into studio-1.4-dev automerge: c4ac7cd automerge: 999a6f9 by Alex Ruiz · 9 years ago
  92. f85bf7f am a14d4524: am d616b835: (-s ours) am b31b1bce: am e2ce7dbe: Merge "Ensures that methods that require a project to use Gradle invoke Projects#isBuildWithGradle." into studio-1.4-dev automerge: 87f289e automerge: 978f6b9 by Alex Ruiz · 9 years ago
  93. 0d0a086 am 5268fb4d: am 7831a36e: (-s ours) am 5dc3c31d: am 843d31f3: Merge "property sheet: Fix failing test" into studio-1.4-dev automerge: c0ef157 automerge: 083e316 by Siva Velusamy · 9 years ago
  94. aea0e82 am e8109211: am adeb66e8: (-s ours) am 8ed60033: am 2d6a8ad4: Merge "Handle new density constant - 360dpi" into studio-1.4-dev automerge: 059ed4f automerge: f204aea by Deepanshu Gupta · 9 years ago
  95. ff4e5cd am f57aeb23: am f17a303b: (-s ours) am fc3f872d: am b37513f7: Merge "Renamed AndroidFacet#isGradleProject to "requiresAndroidModel"." into studio-1.4-dev automerge: 4e063e3 automerge: 290bc1c by Alex Ruiz · 9 years ago
  96. 4830aee am 2aa847fe: am efe50f42: (-s ours) am b24e1948: am d83b5448: Merge "Fix display of alpha colors in statelist picker and table" into studio-1.4-dev automerge: b15c94f automerge: fb6c110 by Jerome Gaillard · 9 years ago
  97. 526ceec am edd9613d: am 1a4041c1: (-s ours) am a9882490: am b112d82b: Merge "More tests broken by 159472" into studio-1.4-dev automerge: 473deeb automerge: eca325a by Joe Baker-Malone · 9 years ago
  98. 94ad834 am ec6d0ad9: am 087d2882: (-s ours) am 929b07a2: am 6a132af4: Merge "Fix a couple of tests running gradlew." into studio-1.4-dev automerge: 4e7db8b automerge: cce09eb by Siva Velusamy · 9 years ago
  99. b840ef0 am 9d664b7f: am a28f771a: (-s ours) am 27061df3: am 53048e64: Merge "Disable TestNGOrderEntryFix and JCiPOrderEntryFix for android studio (not for plugin)" into studio-1.4-dev automerge: e813ba6 automerge: 62cfad6 by Fuyao Zhao · 9 years ago
  100. 603303e am 763e354c: am cc6d17d5: (-s ours) am 80a4a92f: am 25eb035c: Merge "New color selector" into studio-1.4-dev automerge: 6f0804a automerge: 7aa79e6 by Yura · 9 years ago