Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / tools / base / 7899f7fc65cf765fa1ad2cc7670f33691725d7a5
  1. 7899f7f am 2d51e75e: am 0b9e2abf: (-s ours) am 40f6fb41: am b622b867: Merge "Use raw types with JavaVisitor#applicableSuperClasses" into studio-1.4-dev automerge: b02d06f automerge: 1c584f9 by Tor Norbye · 9 years ago
  2. 3bed77b am 04c9e3fe: am 58475493: (-s ours) am f5e6f649: am a6b8d65f: Merge "Add missing getFields() lookup from lint\'s resolved class" into studio-1.4-dev automerge: 2d1eb23 automerge: 3791dd8 by Tor Norbye · 9 years ago
  3. 93f15a4 am 8e56b625: am 91ed3193: (-s ours) am 8022ec90: am 95c28127: Merge "Fix package check for ECJ resolved nodes" into studio-1.4-dev automerge: eceaf03 automerge: 996fe62 by Tor Norbye · 9 years ago
  4. e1a1474 am b963c3ab: am e2efac06: (-s ours) am dfef0790: am f81c2302: Merge "Minify & jack flags in Gradle test project." into studio-1.4-dev automerge: 4bdb3b8 automerge: d324c81 by Xavier Ducrohet · 9 years ago
  5. e16871a am f1d06636: am e8e9be33: (-s ours) am c4dfe315: am 345a97cc: Merge "Share the mockable JAR between subprojects." into studio-1.4-dev automerge: 20f40e3 automerge: 6d4d84d by Michal Bendowski · 9 years ago
  6. 67292d1 am e8fbb7e6: am 957e0f97: (-s ours) am ffeb414f: am a75040a3: Merge "Introduce AndroidGradleOptions" into studio-1.4-dev automerge: 5bb7448 automerge: 28ebb26 by Michal Bendowski · 9 years ago
  7. bc819ac am ab5adb9b: am b67fb17e: (-s ours) am 3a974041: am c3c1112a: Merge "Start fixing IJ code inspection issues in builder." into studio-1.4-dev automerge: 4e8d0a9 automerge: 08c4a09 by Michal Bendowski · 9 years ago
  8. 0bd50b5 am 671c9d61: am c09e123c: (-s ours) am 4a5fbd14: am bc0dec1c: Merge "Fixing NPE when getting extra package display name" into studio-1.4-dev automerge: cdfb324 automerge: 19daa38 by Joe Baker-Malone · 9 years ago
  9. f9c6be3 am 83f64704: am 7abdd81f: (-s ours) am 88365965: am 8103eca7: Merge "IOSchedule 2014 benchmark." into studio-1.4-dev automerge: ec0fe6f automerge: 7a726dd by Xavier Ducrohet · 9 years ago
  10. 9d951b5 am d0e6489b: am 1a842740: (-s ours) am 6a4fe1df: am a2efe3d6: Merge changes I107ec572,I75d9d3ee into studio-1.4-dev automerge: a6d81db automerge: d197a2d by Chris Warrington · 9 years ago
  11. eafe95b am 1ddfd282: am bbce9f33: (-s ours) am ab21bbf1: am 3001f7b2: Merge "Add thead pool size gradle property." into studio-1.4-dev automerge: 151fa7a automerge: 30f6731 by Chris Warrington · 9 years ago
  12. e8a4ea2 am 00a83585: am 7501d45b: (-s ours) am 43f81deb: am 142bf875: Merge changes I1904b53d,I505fced0 into studio-1.4-dev automerge: f347050 automerge: 0cfd791 by Chris Warrington · 9 years ago
  13. 10730c6 am 39c20560: am 6b779696: (-s ours) am 8bbca1fd: am 2548aaca: Merge "Fix ProcessRecorder & RecordingBuildListenerTest." into studio-1.4-dev automerge: a2daa72 automerge: 155b628 by Chris Warrington · 9 years ago
  14. d25ed73 am 0a4dc67f: am ed2a2fe2: (-s ours) am d77d8a12: am b8535429: Merge "Add translatable="false" to generated resvalues." into studio-1.4-dev automerge: d0065dc automerge: f1f5dcd by Chris Warrington · 9 years ago
  15. d70427c am 534ea3b0: am 3e27a865: (-s ours) am ad11009b: am b5808b8c: Merge "Fix connected tests using AndroidReportTask." into studio-1.4-dev automerge: 7c8b98b automerge: 77a2562 by Chris Warrington · 9 years ago
  16. 4a455bf am d240ddcf: am 454ea50d: (-s ours) am 95c4b143: am ae917440: Merge "Check for /tmp/foo in SdkUtilsTest." into studio-1.4-dev automerge: 438424a automerge: 7d2d36f by Michal Bendowski · 9 years ago
  17. 05170b6 am f9d70328: am 0865327a: (-s ours) am a2f17a9f: am 49a47649: Merge "Fix DSL build." into studio-1.4-dev automerge: 1b616a8 automerge: cc57aa5 by Chris Warrington · 9 years ago
  18. 1920bad am db629bf4: am ffe5b6cf: (-s ours) am 8d4c5c9f: am e6240e79: Merge "Move lint tests into lint-test." into studio-1.4-dev automerge: ef8cb66 automerge: 82e6090 by Chris Warrington · 9 years ago
  19. a11d316 am 68c8852a: am 4b610b4f: (-s ours) am 7f944adb: am 2e728edf: Merge "Bug fix: when linting AndroidManiFest, try look up resource to get the string" into studio-1.3-dev automerge: cdb8443 automerge: 80ba2e7 automerge: ffe8c13 by Tor Norbye · 9 years ago
  20. 928145a am 5fb0e26e: am a161b240: (-s ours) am c467744a: am e2f23ff6: Merge "Bug fix: when linting AndroidManiFest, try look up resource to get the string" into studio-1.4-dev automerge: 4f21375 automerge: a5bfb17 by Tor Norbye · 9 years ago
  21. 1c82fc7 am 4eff88af: am e2c12f64: (-s ours) am f53c76df: am e594a5d5: Merge changes I2e41f33a,I9c5bded1 into studio-1.4-dev automerge: 87cab50 automerge: d3947f9 by Chris Warrington · 9 years ago
  22. f47eaac am 973b4fea: am 15c50cd6: (-s ours) am ceaa11cf: am 6e57d587: Merge "Make annotations extractor handle enum types" into studio-1.4-dev automerge: 3919a6c automerge: b09f236 by Tor Norbye · 9 years ago
  23. b746069 am fb1ac8b3: am 6ff61685: (-s ours) am b6c0a7ec: am b65f191a: Merge "Lint: Add support for looking up package element annotations" into studio-1.4-dev automerge: f04c8ef automerge: 1e0088b by Tor Norbye · 9 years ago
  24. 3c0a7ad am 17eefa93: am 0fc01d4a: (-s ours) am c784ceff: am 936d833e: Merge "Defines a constant for the xml tag "selector"" into studio-1.4-dev automerge: a3d3eb0 automerge: 96ed686 by Jerome Gaillard · 9 years ago
  25. 412efef am 9bddca62: am f1e6f670: (-s ours) am 2991975d: am e8c618fd: Merge "resolve merge conflicts of ee1dd12 to studio-1.4-dev." into studio-1.4-dev automerge: 178ff75 automerge: 84bbeda by Tor Norbye · 9 years ago
  26. 2137cbc am 672f6dda: am 6356764e: (-s ours) am b9a7d031: am 988c1542: Merge "resolve merge conflicts of a4b5aaa to studio-1.4-dev." into studio-1.4-dev automerge: bb99d71 automerge: f1dc0aa by Tor Norbye · 9 years ago
  27. e6eae03 am 9bffbeb0: am 9c8d9819: (-s ours) am 720b3d2a: am f4805bcf: Merge "Trim spaces for user specified flags" into studio-1.4-dev automerge: f641c98 automerge: f7a4833 by Raymond Chiu · 9 years ago
  28. 7c93990 am fd0f4596: am 8a57cb4a: (-s ours) am 105ed10c: am 94fe7d9a: Merge "Reorder STL flags before user specified flags" into studio-1.4-dev automerge: 0d22854 automerge: abb561b by Raymond Chiu · 9 years ago
  29. 234983a am fbf6eff2: am d9db45c3: (-s ours) am 3bf22b95: am 485dbd4c: Merge "Add SmokeTests category" into studio-1.4-dev automerge: e3bdac7 automerge: 2af93f4 by Raymond Chiu · 9 years ago
  30. 62f2631 am d528d075: am bdcd820a: (-s ours) am 285324d3: am bb248396: Merge "Warn about suspicious XML namepspace and prefix combinations" into studio-1.4-dev automerge: 168618b automerge: bae31ac by Tor Norbye · 9 years ago
  31. 3a4de10 am d8f41773: am 7e90c0ec: (-s ours) am 1d87c2f7: am 0082fb7e: Merge "Remove convertionMapping for JavaCompile source/targetCompatibility" into studio-1.4-dev automerge: 9820ec0 automerge: 899b2c9 by Raymond Chiu · 9 years ago
  32. 6beee80 am 7f4d43c3: am e5a65448: (-s ours) am f5965cc5: am cb5af172: Merge "Device handling changes" into studio-1.4-dev automerge: bd3e68d automerge: a9c87d6 by Joe Baker-Malone · 9 years ago
  33. 3e950bd am 483275d5: am 9c26d164: (-s ours) am 12f51098: am a3b0bd55: Merge "Add gradle version to benchmark properties." into studio-1.4-dev automerge: f078a4f automerge: 75bc741 by Xavier Ducrohet · 9 years ago
  34. 3f6ef78 am 1a2b734c: am a51ba31b: (-s ours) am 3cfce7ad: am 0f87bdc0: Merge "Fixing HtmlBuilderTest" into studio-1.4-dev automerge: 98331f5 automerge: 87e2a2f by Joe Baker-Malone · 9 years ago
  35. cab3140 am 42d9c0b5: am 61d32030: (-s ours) am 56933efd: am ccdfcb54: Merge "Fix dslDoc build broken by groovy to java refactor." into studio-1.4-dev automerge: bf60b7d automerge: 71283c8 by Chris Warrington · 9 years ago
  36. 6712d70 am 9c293b2f: am 7cb73015: (-s ours) am 73d48629: am 3a90bc81: Merge changes I376f889d,If6161e9a into studio-1.4-dev automerge: 36dd523 automerge: 59f70eb by Chris Warrington · 9 years ago
  37. 11221db am 378306fd: am a5d1b4ed: (-s ours) am 942c62a5: am d66b9a2d: Merge "Send profiling data once per build." into studio-1.4-dev automerge: 2d0aacf automerge: c1a624b by Raluca Sauciuc · 9 years ago
  38. 0a1fc31 am 3ba649b2: am cd195505: (-s ours) am 99261daa: am 6b70ec5e: Merge "Use Action<VariantFilter> rather than a closure." into studio-1.4-dev automerge: e3c3c4b automerge: ca7c127 by Chris Warrington · 9 years ago
  39. ef77ee0 am 36340ce9: am c7cc7c0b: (-s ours) am f5aae823: am e317266f: Merge changes I2d3d3f2f,I6bd0de89 into studio-1.4-dev automerge: 7adf1ff automerge: 54b18ac by Chris Warrington · 9 years ago
  40. 7d76873 am fb4d9982: am b5ff43af: (-s ours) am 2ebff404: am 27e0dd73: Merge "Removing newlines since IJ converts them to <br/> on mac" into studio-1.4-dev automerge: 2743780 automerge: 99bd408 by Joe Baker-Malone · 9 years ago
  41. d89d1f5 am 53eb2ee8: am d10e208c: (-s ours) am 3f7937d8: am b85539a5: Merge "Framework for temporary changes in tests." into studio-1.4-dev automerge: 02310fb automerge: 96996b5 by Chris Warrington · 9 years ago
  42. 0de9848 am 273994b0: am 556e3f77: (-s ours) am fa1e63e8: am d737ff22: Merge "Fixing system image hash code" into studio-1.4-dev automerge: 9f349c2 automerge: b2d842c by Joe Baker-Malone · 9 years ago
  43. 78aea96 am b075d67d: am 10e4db93: (-s ours) am 69e59f7d: am ffec9490: Merge "Fix ConsumerException caused NPE." into studio-1.4-dev automerge: 5cc4c1f automerge: 1c4ca85 by Chris Warrington · 9 years ago
  44. c85a243 am a934fc42: am 4888f34c: (-s ours) am c412e4cd: am cc01b915: Merge "Fix installDebug task." into studio-1.4-dev automerge: b580d8e automerge: 7ee9ed6 by Chris Warrington · 9 years ago
  45. 717aece am 936505ab: am cf11de45: (-s ours) am 5d8041d4: am fa2d9a40: Merge "Fix extra test runner args command line." into studio-1.4-dev automerge: 1ef3afa automerge: 7871781 by Michal Bendowski · 9 years ago
  46. e8fdb39 am 360786f6: am 5fa81330: (-s ours) am de8ea778: am b2481354: Merge "ddmlib: add a couple of system property names" into studio-1.3-dev automerge: 2cdc224 automerge: 5b7246a automerge: 5fdffe9 by Siva Velusamy · 9 years ago
  47. e7cf917 am a83a9a0b: am 2179e742: (-s ours) am 284678c2: am 640e7b08: Merge "Fix MergingReportTest." into studio-1.4-dev automerge: dc1e2d5 automerge: 7ae0bc4 by Chris Warrington · 9 years ago
  48. b203e57 am 11f1d5e4: am 75921f4f: (-s ours) am b3be238e: am 927fde19: Merge "ddmlib: add a couple of system property names" into studio-1.4-dev automerge: 5002e6c automerge: 63fee77 by Siva Velusamy · 9 years ago
  49. 74475c2 am 582d43f1: am ac409225: (-s ours) am 98454245: am 45968983: Merge "Adding support for wear devices with chins" into studio-1.4-dev automerge: 364748a automerge: 5a4547e by Joe Baker-Malone · 9 years ago
  50. 4c90ecf am db087dd1: am fbbd3016: (-s ours) am dce7ea23: am acd6339e: Merge "Fix ManifestMerger2Test by adding missing "."." into studio-1.4-dev automerge: 11eeda2 automerge: 208edd5 by Chris Warrington · 9 years ago
  51. b8d068e am b66b48be: am 8af88605: (-s ours) am 8c4a87e8: am db644c9e: Merge "Refactor Message & SourceFilePosition serializers." into studio-1.4-dev automerge: c64bbde automerge: 7612b9d by Chris Warrington · 9 years ago
  52. a4309be am bafa455f: am 1bca0235: (-s ours) am 189d0253: am e3c4f0ec: Merge "Fix some SVG parse problems." into studio-1.4-dev automerge: 20899fe automerge: 8afe2b1 by ztenghui · 9 years ago
  53. 997b4f0 am 8dc4835c: am e62a462e: (-s ours) am 4794f2c3: am ae7fa642: Merge "Improve merge error logs." into studio-1.4-dev automerge: ea2b3a3 automerge: f26e562 by Michal Bendowski · 9 years ago
  54. a6d0edc am 3c3a1406: am 67ad863c: (-s ours) am 9065805b: am e3e37745: Merge "Convert all getIs* method in Managed to get*" into studio-1.3-dev automerge: 7018816 automerge: aca0f83 automerge: d166f80 by Raymond Chiu · 9 years ago
  55. ccdcc92 am d8f5d2a9: am 52ac2d1a: (-s ours) am 93230408: am b83e5d06: Merge "Move jniDebuggable to NdkOptions" into studio-1.3-dev automerge: c8eab0a automerge: dc1995b automerge: c45029c by Raymond Chiu · 9 years ago
  56. 7eee072 am c0bc3f60: am 64c253bb: (-s ours) am 6a76f0c3: am e5f1b471: Merge "Enable all other perf benchmark to use new profiling data." into studio-1.4-dev automerge: 672e157 automerge: 537606b by Xavier Ducrohet · 9 years ago
  57. 91d150b am 07989ec4: am d364053d: (-s ours) am 16adc9fe: am b7b531c2: Merge "Add variant info to the profiling." into studio-1.4-dev automerge: 95ae15d automerge: b9cce7a by Xavier Ducrohet · 9 years ago
  58. c233414 am 4889b9be: am 6c82200b: (-s ours) am b189bb3d: am 01157465: Merge "Skip the dtd parsing to avoid long UI pause" into studio-1.4-dev automerge: ffcea60 automerge: b299050 by ztenghui · 9 years ago
  59. adc8b8f am e8680e7a: am 77db06e7: (-s ours) am de621970: am e519306c: Merge "Show the error when there is no viewbox attribute in the root tag." into studio-1.4-dev automerge: 279d99f automerge: bccdc87 by ztenghui · 9 years ago
  60. aa4e5e7 am d22cb397: am a29e174b: (-s ours) am d43728a7: am fe319bd0: Merge "Add benchmark name and mode to performance reporting." into studio-1.4-dev automerge: 17a1a7f automerge: aa1705d by Xavier Ducrohet · 9 years ago
  61. 0d96fb1 am ff71b21f: am 48ca3bcc: (-s ours) am 5ebf1271: am 1a910f07: Merge "Read versioName from main manifest." into studio-1.4-dev automerge: 9879834 automerge: a834d93 by Michal Bendowski · 9 years ago
  62. 2f65c44 am 7826e92f: am 20570ede: (-s ours) am a8f5f9e3: am 5bfb995c: Merge "More explicit failures for children of BaseTask." into studio-1.4-dev automerge: 3d2316a automerge: c120f77 by Chris Warrington · 9 years ago
  63. 59b9df6 am 706e8364: am 3968ec42: (-s ours) am ff39814e: am f410de7a: Merge "Prevent IO resource leak warnings in DeviceParser." into studio-1.4-dev automerge: 1206027 automerge: ce50733 by Deepanshu Gupta · 9 years ago
  64. d836bff am bc25fcff: am 84e62746: (-s ours) am 661dee38: am 90e56ee3: Merge "Add lint check for suspicious flag initialization syntax" into studio-1.4-dev automerge: 428c3ac automerge: 2b00596 by Tor Norbye · 9 years ago
  65. cbe633e am 64550c56: am 44f856f9: (-s ours) am d7af6715: am 61b22dff: Merge "Unit test for negative and constant valued @IntRange/@Size" into studio-1.4-dev automerge: 7bbff9b automerge: 26cc3a4 by Tor Norbye · 9 years ago
  66. b3b0c57 am 0d44d1cd: am 842ae980: (-s ours) am 55847a0b: am d1e9a39c: Merge "Make it harder to break variants API." into studio-1.4-dev automerge: a03c621 automerge: 32e7026 by Michal Bendowski · 9 years ago
  67. 0d6c1f0 am f8dd143d: am 01110bc2: (-s ours) am b6bbc0a3: am d52c8555: Merge "Detect dependency cycles." into studio-1.4-dev automerge: 4f78c7d automerge: 5833f99 by Michal Bendowski · 9 years ago
  68. cb01aad am 32ac5671: am cc2fd072: (-s ours) am 31f9f62b: am 39ba20c7: Merge "Package asset-studio as a stand-alone tool." into studio-1.4-dev automerge: 8e5f12f automerge: 246b122 by Michal Bendowski · 9 years ago
  69. 9865b1f am 83738d43: am ef273856: (-s ours) am 96f93658: am a5f45f25: Merge changes from topic \'to_java_1\' into studio-1.4-dev automerge: f8438e6 automerge: 0a471b5 by Chris Warrington · 9 years ago
  70. c9748d4 am 5e759474: am d4f0894f: (-s ours) am 33e69d04: am f9f72e74: Merge "Fix RemoteAndroidTestRunnerTest after I broke it." into studio-1.4-dev automerge: b5c6108 automerge: dec66f3 by Chris Warrington · 9 years ago
  71. 485745b am 476a2187: am c18e8f90: (-s ours) am eeea8e6a: am 46bf0648: Merge "Make theme in ResourceUrl final." into studio-1.4-dev automerge: 7d8eee4 automerge: 413cd55 by Deepanshu Gupta · 9 years ago
  72. 9ebbd68 am fa4830e0: am 13a6e01a: (-s ours) am 2bfa9234: am d0df8a74: Merge "Support better ordering for the VdIcon" into studio-1.4-dev automerge: 74929e0 automerge: 0992d64 by ztenghui · 9 years ago
  73. 5c020d2 am 8a7f88ec: am 1b9b26aa: (-s ours) am 37b7ef29: am 8bb7a910: Merge "resolve merge conflicts of 3e7d47f to studio-1.4-dev." into studio-1.4-dev automerge: 0ad3eeb automerge: 3ad6f1e by Tor Norbye · 9 years ago
  74. 80ef3d7 am 963501f7: am 783a40bb: (-s ours) am 6d835bff: am 01e9356f: Merge "Fix test breakage when running tests on newer JDK" into studio-1.3-dev automerge: 819cb59 automerge: 65440cd automerge: 6f6c751 by Tor Norbye · 9 years ago
  75. 204caf4 am 38463ac3: am e295cc2e: (-s ours) am 58db0a10: am c000bf52: Merge "Fix NPE in ResourceItem when used by Studio." into studio-1.3-dev automerge: 09e9d92 automerge: 4de3d6c automerge: 4bc20a4 by Chris Warrington · 9 years ago
  76. aa1dabb am 2f0cee5c: am f18b6519: (-s ours) am c3c8a8b8: am 77a63622: Merge "178194: "Replace with specific version" quickfix not working in some cases" into studio-1.3-dev automerge: 3099d22 automerge: f9e62c9 automerge: 6b6e4c3 by Tor Norbye · 9 years ago
  77. ad63e60 am 4142c5b3: am 925704d9: (-s ours) am a2ee6027: am 26b25861: Merge "fixed experimental version setting." into studio-1.3-dev automerge: f62e908 automerge: b47c8a2 automerge: 18a05fe by Jerome Dochez · 9 years ago
  78. ad762ce am 23b39a44: am 1dacccae: (-s ours) am a9b9c0da: am 32adb0b9: Merge "Ensure that preBuild is run before pre<variant>Build." into studio-1.3-dev automerge: b7dac8d automerge: 1d3b7b9 automerge: 5dd5e8a by Xavier Ducrohet · 9 years ago
  79. 62e2575 am 433f382c: am 2e67bf13: (-s ours) am f5b43642: am 091ede5c: Merge "fixed missing property definition" into studio-1.3-dev automerge: edf5c6a automerge: b91cda2 automerge: b758605 by Jerome Dochez · 9 years ago
  80. e66c0a0 am af4f58a2: am 7911fab9: (-s ours) am a4dec67a: am ba606786: Merge "enable gradle experimental publishing and changed version" into studio-1.3-dev automerge: fa97f00 automerge: 1785032 automerge: 1a9a230 by Jerome Dochez · 9 years ago
  81. 9494a2c am f5539523: am 8d509410: (-s ours) am 81e2ee70: am 4671f50d: Merge "fixed task dependencies" into studio-1.3-dev automerge: 90b393a automerge: 4dbda89 automerge: be4ce88 by Jerome Dochez · 9 years ago
  82. 1e29a8e am 16e3d1e2: am 362131b2: (-s ours) am 8098cada: am 65d17059: Merge "Refactoring subclass searching functionality." into studio-1.4-dev automerge: ba6e5bd automerge: 9cfd957 by Chester Hsieh · 9 years ago
  83. 31b3ee2 am e1962531: am ecdecba2: (-s ours) am 016f55c2: am 690a2ec0: Merge "Making ClassObj comparison more precise." into studio-1.4-dev automerge: ad94953 automerge: 4c7890f by Chester Hsieh · 9 years ago
  84. a179b51 am c02edc23: am 734e9d55: (-s ours) am a50aec79: am fc96edca: Merge "Combine JarJarWithJack test into JarJarTest." into studio-1.4-dev automerge: efed8d6 automerge: 01653bb by Chris Warrington · 9 years ago
  85. 7831f2e am a7167d19: am 8e9ac04a: (-s ours) am 7ada0620: am 0323fb43: Merge "Fix MergeResources intermediate subdirectory." into studio-1.4-dev automerge: 25716d6 automerge: f59636c by Chris Warrington · 9 years ago
  86. 565390b am 0ade3536: am 210c6c57: (-s ours) am 5ab7fe66: am 28fcae2b: Merge "Test the rewriting of AAPT error messages." into studio-1.4-dev automerge: f15184e automerge: c700796 by Chris Warrington · 9 years ago
  87. acf6408 am b5301360: am 89a3c587: (-s ours) am a4146e76: am e5249f8c: Merge "Detect duplication in long constants too (only did int\'s)" into studio-1.4-dev automerge: b9c52c4 automerge: e7fea24 by Tor Norbye · 9 years ago
  88. d7962ed am c91ed3a5: am 424a5beb: (-s ours) am 73b29821: am 59497b19: Merge "Fix typo in TestingSupportLibraryTest." into studio-1.4-dev automerge: abdb9ef automerge: a9ab92e by Chris Warrington · 9 years ago
  89. 64aaacd am 3e3945de: am 7a290348: (-s ours) am 95d9ce75: am 343c6d63: Merge "Only run intent test if the SDK annotations.zip is up to date" into studio-1.4-dev automerge: ba78b8d automerge: 1a0b31f by Tor Norbye · 9 years ago
  90. b155ee3 am 587d684c: am b62c13f6: (-s ours) am e632015c: am 3c1a1ca5: Merge "Fix build" into studio-1.4-dev automerge: 52e2d8e automerge: 95f0c46 by Deepanshu Gupta · 9 years ago
  91. f1fcdb1 am b807750c: am 1e6c6a04: (-s ours) am 9c498ed8: am 5fdadc26: Merge "Test for TestingSupportLibrary ignored test." into studio-1.4-dev automerge: 88dbbe5 automerge: c8672e2 by Chris Warrington · 9 years ago
  92. 9942c30 am 2fcd11c2: am e83736f4: (-s ours) am 57f4c1b2: am 7f52b118: Merge "Remove unused toXml argument: preserveWhitespace." into studio-1.4-dev automerge: 0313d7f automerge: 130fbe3 by Chris Warrington · 9 years ago
  93. 870e9b6 am 81c90497: am f7abdceb: (-s ours) am 60b5b12f: am fe2ea152: Merge "Clean up use of deprecated JUnit apis." into studio-1.4-dev automerge: 33d08a1 automerge: 236515b by Chris Warrington · 9 years ago
  94. ab104a1 am ca72d6cc: am 7f8ecb8e: (-s ours) am a4cb2e4c: am 003c6c05: Merge "Fixing perflib to only count referent field as soft reference." into studio-1.4-dev automerge: b0e7f67 automerge: 1424eee by Chester Hsieh · 9 years ago
  95. 6f2fe03 am 0bf5fa13: am 417991aa: (-s ours) am 55037ff4: am 5271333d: Merge "Breaking up .trace extension string into two components." into studio-1.4-dev automerge: 8ae4d6a automerge: ba6119f by Chester Hsieh · 9 years ago
  96. 4756205 am 12ebcf0c: am dafa2857: (-s ours) am 93b673e2: am e25fe5e7: Merge "Adding functionality to perflib to read subsequences of raw data." into studio-1.4-dev automerge: 7d02f7f automerge: 55e57e6 by Chester Hsieh · 9 years ago
  97. 6ceebb2 am 76b062aa: am 183b3b32: (-s ours) am 5775f675: am 00641a90: Merge "Fix PropFetcherTest by adding a missing stub method" into studio-1.4-dev automerge: 398474d automerge: 8f6868d by Siva Velusamy · 9 years ago
  98. 54c8110 am 9601e49c: am a30c86a5: (-s ours) am 6a8935aa: am 7b90f21b: Merge ""Update" and "Step" state now bound together" into studio-1.4-dev automerge: 01af66f automerge: 1f8e5c4 by David Herman · 9 years ago
  99. 458096c am 7551b22d: am e2bb66df: (-s ours) am d2e175cb: am a120a061: Merge "Minor inheritance restrictions added to AnimatedComponent" into studio-1.4-dev automerge: a8c4b9c automerge: c568e64 by David Herman · 9 years ago
  100. 0d57b12 am 0f46ff07: am 933c485a: (-s ours) am 27b0c8cf: am 36c6038a: Merge "Warn about repeated constants in @IntDefs for flags too" into studio-1.4-dev automerge: d814f23 automerge: cfef305 by Tor Norbye · 9 years ago