Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / tools / base / refs/heads/int/p/fp2
  1. 908b391 Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 am: 0562b43a09 am: 22b7ea6e04 am: fbab2ed4ed am: b3d01579a0 by Josiah Gaskin · 9 years ago int/p/fp2
  2. 034c789 Merge "Generate inclusive and exclusive times for all calls." am: 0817cbeaf7 am: 3c86568176 am: 61cc5cf0b9 am: 806f986225 am: 933a5383ed am: ede47acf8d by Siva Velusamy · 9 years ago
  3. f41d2e8 Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49 am: d7c4eb8534 am: eb479b522f am: dcdd7c5bd7 am: 2deb74fa28 by Xavier Ducrohet · 9 years ago
  4. 4811b53 Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422 am: 1b7fc2999a am: 11dc318ce2 am: 433b1f85bd am: 643150e927 by Xavier Ducrohet · 9 years ago
  5. 6e2ee9a Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 am: 0562b43a09 am: 22b7ea6e04 am: fbab2ed4ed by Josiah Gaskin · 9 years ago
  6. 8c9d55e Merge "Generate inclusive and exclusive times for all calls." am: 0817cbeaf7 am: 3c86568176 am: 61cc5cf0b9 am: 806f986225 am: 933a5383ed by Siva Velusamy · 9 years ago
  7. 7c4435e Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49 am: d7c4eb8534 am: eb479b522f am: dcdd7c5bd7 by Xavier Ducrohet · 9 years ago
  8. 007572f Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422 am: 1b7fc2999a am: 11dc318ce2 am: 433b1f85bd by Xavier Ducrohet · 9 years ago
  9. b3d0157 Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 am: 0562b43a09 am: 22b7ea6e04 by Josiah Gaskin · 9 years ago
  10. ede47ac Merge "Generate inclusive and exclusive times for all calls." am: 0817cbeaf7 am: 3c86568176 am: 61cc5cf0b9 am: 806f986225 by Siva Velusamy · 9 years ago
  11. 2deb74f Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49 am: d7c4eb8534 am: eb479b522f by Xavier Ducrohet · 9 years ago
  12. 643150e Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422 am: 1b7fc2999a am: 11dc318ce2 by Xavier Ducrohet · 9 years ago
  13. fbab2ed Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 am: 0562b43a09 by Josiah Gaskin · 9 years ago
  14. 933a538 Merge "Generate inclusive and exclusive times for all calls." am: 0817cbeaf7 am: 3c86568176 am: 61cc5cf0b9 by Siva Velusamy · 9 years ago
  15. dcdd7c5 Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49 am: d7c4eb8534 by Xavier Ducrohet · 9 years ago
  16. 433b1f8 Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422 am: 1b7fc2999a by Xavier Ducrohet · 9 years ago
  17. 22b7ea6 Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 by Josiah Gaskin · 9 years ago
  18. 806f986 Merge "Generate inclusive and exclusive times for all calls." am: 0817cbeaf7 am: 3c86568176 by Siva Velusamy · 9 years ago
  19. eb479b5 Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49 am: d7c4eb8534 by Xavier Ducrohet · 9 years ago
  20. 11dc318 Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422 by Xavier Ducrohet · 9 years ago
  21. 0562b43 Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 by Josiah Gaskin · 9 years ago
  22. 61cc5cf Merge "Generate inclusive and exclusive times for all calls." am: 0817cbeaf7 by Siva Velusamy · 9 years ago
  23. d7c4eb8 Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49 by Xavier Ducrohet · 9 years ago
  24. 1b7fc29 Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422 by Xavier Ducrohet · 9 years ago
  25. f436912 Merge "Update New Project Template Dependencies" am: f908080572 by Josiah Gaskin · 9 years ago
  26. 3c86568 Merge "Generate inclusive and exclusive times for all calls." am: 0817cbeaf7 by Siva Velusamy · 9 years ago
  27. 607b50b Merge "Move to Gradle 1.7" am: cbb9f117f7 by Xavier Ducrohet · 9 years ago
  28. cc321c9 Merge "Update internal gradle plugin." am: 66c78e3f88 by Xavier Ducrohet · 9 years ago
  29. d72138b am deccb37d: am 34021aee: (-s ours) am 1d1c1563: am 94d1fe81: Merge "Improve error messages related to signing." into studio-1.4-dev automerge: 944ec17 automerge: 7a7c2b3 by Michal Bendowski · 9 years ago
  30. 67577dd am 1d7018aa: am 75cae261: (-s ours) am 9de94ae0: am 8737cb1c: Merge "changelog.txt: fix a typo to correctly refer to "unitTests.all"" into studio-1.4-dev automerge: 827d0c8 automerge: d36c75c by Michal Bendowski · 9 years ago
  31. 6632439 am 32ad5e7b: am 8c4e0f1a: (-s ours) am 9ecb5ebd: am 2c6dda6b: Merge "Make asset studio module depend on sdk-common-base" into studio-1.4-dev automerge: 5408b74 automerge: 295883c by Tor Norbye · 9 years ago
  32. 409bb51 am dab2f87f: am 9c760354: (-s ours) am 72193310: am 09ad17fb: Merge "Fix test failure by file duplication" into studio-1.4-dev automerge: f4f173d automerge: a7f4329 by Xavier Ducrohet · 9 years ago
  33. 6d19c2e am bd3cb833: am 6f534944: (-s ours) am 47941410: am dd1004df: Merge "181820: Android Gradle plugin 1.3.0 breaks lint html reporting" into studio-1.3-dev automerge: 6b4c635 automerge: 9e220c9 automerge: 557fdcc by Tor Norbye · 9 years ago
  34. 93bdfa9 am 1bbdea2a: am 631f8a79: (-s ours) am 5ae28008: am ca2acd80: Merge "Move the vector drawble conversion/preview library from asset lib to sdk-common" into studio-1.4-dev automerge: 148edb3 automerge: a8bf03b by Tenghui Zhu · 9 years ago
  35. 7797b0f am ac069cdf: am 02c79dc3: (-s ours) am 46711741: am 53343dba: Merge "181789: Incorrect/inconsistent lint + documentation for Snackbar" into studio-1.4-dev automerge: 10720a8 automerge: 1fd1cea by Tor Norbye · 9 years ago
  36. 4500fda am 6b6d5dbb: am b59c8a98: (-s ours) am 80fb65f8: am 83237727: Merge changes Id0107ca7,I7b1e1396 into studio-1.4-dev automerge: 135b1b0 automerge: a591bd8 by Chris Warrington · 9 years ago
  37. 3ac5d8a am 1a100286: am e932d238: (-s ours) am 2b82ed7d: am d41443b3: Merge "Fix L+ install when APK name contains a space." into studio-1.4-dev automerge: 49ed7e1 automerge: 75a2985 by Chris Warrington · 9 years ago
  38. 516264a am d4670102: am c51d5e76: (-s ours) am 6b94d009: am 6b38b2cb: Merge "Add IDE files for jack/jill API projects." into studio-1.4-dev automerge: 5dd7e44 automerge: cfaf5b3 by Xavier Ducrohet · 9 years ago
  39. f6c9a6a am 501805ba: am 102518d9: (-s ours) am c2b92d6e: am c6cc7439: Merge "Jack and Jill API version 0.9" into studio-1.4-dev automerge: 2f93e5b automerge: baae147 by Xavier Ducrohet · 9 years ago
  40. c274647 am 41cfd244: am 743ef569: (-s ours) am 18e499f9: am 79352dd5: Merge "Add test for variant specific NDK config" into studio-1.4-dev automerge: 152f5dc automerge: d83cb6a by Raymond Chiu · 9 years ago
  41. 153a627 am 32a660b3: am 523def1d: (-s ours) am ac85cf78: am f8342a9e: Merge "Allow multiple serial numbers in ANDROID_SERIAL." into studio-1.4-dev automerge: 75f8bef automerge: 849a260 by Chris Warrington · 9 years ago
  42. 3295d29 am cc300c62: am f461672e: (-s ours) am bf9c9ac7: am 4e78e952: Merge "Update to gradle 2.5" into studio-1.3-dev automerge: b65d578 automerge: 901efce automerge: c343969 by Raymond Chiu · 9 years ago
  43. 5e91d01 am eac4805b: am d798b20c: (-s ours) am 5eae4b7c: am 6e9a6f06: Merge "Fix handling of addr2line." into studio-1.4-dev automerge: b642a36 automerge: 3715f77 by Christopher Ferris · 9 years ago
  44. e1d0e4a am cbdbbd60: am 3a0e36ce: (-s ours) am 3b101d08: am 6ee4bf15: Merge changes I215bf219,I1d0a79e7 into studio-1.4-dev automerge: 9ba5510 automerge: 4527994 by Chris Warrington · 9 years ago
  45. 778cdbc am a2b605aa: am cd63d5ec: (-s ours) am f4d12486: am 61774329: Merge "Add Google Map Activity template for Android Wear." into studio-1.4-dev automerge: a0d70fb automerge: b1ee220 by David Herman · 9 years ago
  46. a8ba12b am ddb4b7f9: am 1bf0c8b5: (-s ours) am a4f904ca: am 3b2874fc: Merge "Update Google Maps Activity template for latest API changes." into studio-1.4-dev automerge: 704a176 automerge: 429b3f0 by David Herman · 9 years ago
  47. a740f41 am a4cafb5e: am 62e6a8a0: (-s ours) am 85b7d557: am 1c2fc48e: Merge "Fix Separate test module dependency." into studio-1.3-dev automerge: 1014a96 automerge: 56d4131 automerge: f517e02 by Chris Warrington · 9 years ago
  48. 1a9b281 am 555d10ae: am 4e34a738: (-s ours) am 14e705e4: am 59a48820: Merge "Fix the way themes are identified among styles" into studio-1.4-dev automerge: eaa52da automerge: 3084d19 by Jerome Gaillard · 9 years ago
  49. fbb83b9 am 611d238a: am 5029b3ed: (-s ours) am d726e775: am 69dfe09e: Merge "Fix packageConfig description" into studio-1.4-dev automerge: 9303853 automerge: ad9bfbd by Raymond Chiu · 9 years ago
  50. 8567f83 am 76ae24d8: am db5eb006: (-s ours) am ac1a5f03: am 674d2490: Merge changes I329c6475,I7b26dd66 into studio-1.4-dev automerge: 573805c automerge: 2527458 by Chris Warrington · 9 years ago
  51. c62cf11 am ff3940b4: am 49892747: (-s ours) am bd27b7bb: am d4a11eae: Merge changes Ib8cb7ba0,I7b025b06 into studio-1.4-dev automerge: b46406d automerge: 4ef1afd by Chris Warrington · 9 years ago
  52. fa162a8 am 242ab5a2: am 3d0be8e3: (-s ours) am e3876591: am 5a9049fc: Merge "Capitalize multi-flavor dir names." into studio-1.4-dev automerge: df71467 automerge: 67f4c78 by Michal Bendowski · 9 years ago
  53. e7d3756 am 7da949b8: am defb2cb4: (-s ours) am 5b432fd4: am 5b6cfc6b: Merge "Allow 360dpi devices for avd" into studio-1.4-dev automerge: 3874d2d automerge: 84ba591 by Griff Hazen · 9 years ago
  54. 15148cd am 5bcd4c7f: am 4014c13f: (-s ours) am fa6e7d9d: am b450aa9c: Merge "Updated "recommended" version of Gradle plugin to 1.3.0." into studio-1.3-dev automerge: e385254 automerge: d794cc9 automerge: e977991 by Alex Ruiz · 9 years ago
  55. 3c64fb2 am a3d3eb2f: am e7236641: (-s ours) am ecf1dabb: am 49784deb: Merge "Allow tweaking size, alpha and auto mirror in the UI." into studio-1.4-dev automerge: 452b7d6 automerge: 4e62f0f by Tenghui Zhu · 9 years ago
  56. a5d1050 am 644027a9: am 50f4bd19: (-s ours) am 0e86ef46: am bf8169fc: Merge "Change retention policy of annotations from class to source" into studio-1.4-dev automerge: 6daea43 automerge: dd18cf4 by Siva Velusamy · 9 years ago
  57. 7d6d349 am 5b6a409e: am f33446c0: (-s ours) am a2cdfbbf: am c38df42b: Merge "Convert PackageSplitRes task to java" into studio-1.4-dev automerge: 29c4c4b automerge: c05d77b by Raymond Chiu · 9 years ago
  58. e076688 am 0baf42f0: am b701c7ae: (-s ours) am dee540e7: am e4866794: Merge "Rename PackageSplitRes task to java" into studio-1.4-dev automerge: 2db322b automerge: 96e319a by Raymond Chiu · 9 years ago
  59. 5b13a6e am 84dbd57b: am 715a72c2: (-s ours) am dc73e36f: am 1d6bc6e2: Merge changes I305329a1,I93a72da7 into studio-1.4-dev automerge: 6b5c8e2 automerge: dab8362 by Raymond Chiu · 9 years ago
  60. 45f7b38 am b1bbb94d: am a9cd748b: (-s ours) am aa6df533: am b74ba671: Merge "Add dependency in integrations tests for presubmit runner" into studio-1.4-dev automerge: ea52b21 automerge: 775b585 by Chris Warrington · 9 years ago
  61. 43030a1 am e27d66d0: am 36a643f5: (-s ours) am f80049d3: am 8af1f251: Merge "Fix Separate test module dependency." into studio-1.4-dev automerge: 8b7a32b automerge: 9f43f5f by Chris Warrington · 9 years ago
  62. ad75552 am c85bec6f: am d91f1da4: (-s ours) am adccd2b7: am e095d4f6: Merge "Update builder-model to 1.3.0" into studio-1.3-dev automerge: 2c6cacf automerge: 66fd32d automerge: 7d08f18 by Tor Norbye · 9 years ago
  63. f653630 am 66a819ad: am 7ab64464: (-s ours) am 5e63d661: am ca6432ca: Merge "Fix extra test runner args command line." into studio-1.3-dev automerge: cce504a -s ours automerge: 9706aa4 automerge: 28e52a7 by Xavier Ducrohet · 9 years ago
  64. e4e8baf am a319973c: am 6e002db7: (-s ours) am 13f83d45: am cf9329fa: Merge "Add option to getDensityDpi directly." into studio-1.3-dev automerge: 2a761be automerge: c4309f2 automerge: d226521 by Tor Norbye · 9 years ago
  65. 794dfd9 am 884a90e5: am 3e6acecc: (-s ours) am c686b4be: am c41681f3: Merge "Fixing NPE when getting extra package display name" into studio-1.3-dev automerge: 419eae5 automerge: bab51cb automerge: 558e3fe by Tor Norbye · 9 years ago
  66. d491cf8 am dd2b0f46: am b698a909: (-s ours) am 45897ae1: am 7484889e: Merge "Add new density constant - 360dpi" into studio-1.3-dev automerge: 9782932 automerge: 6196f83 automerge: 13dfe29 by Tor Norbye · 9 years ago
  67. 0ed895b am 0437e344: am 3bb4dd0b: (-s ours) am b58498b7: am 817b9f10: Merge "resolve merge conflicts of 26786ad to studio-1.4-dev." into studio-1.4-dev automerge: bb09599 automerge: f0e710c by Raymond Chiu · 9 years ago
  68. 30232c5 am f9e55b2c: am 864cf7b3: (-s ours) am 69472e89: am 69d06f4c: Merge "Avoids race condition that leads to NPE." into studio-1.3-dev automerge: 7b02778 automerge: cd106c3 automerge: 69553f0 by estebandlc · 9 years ago
  69. 0542d34 am 72dfc3ad: am 594cd7bd: (-s ours) am b6e1804d: am 136fe241: Merge "Adding functionality to perflib to read subsequences of raw data." into studio-1.3-dev automerge: a524749 automerge: 9b21904 automerge: 065c954 by Esteban de la Canal · 9 years ago
  70. 445ef1f am 78a66e6f: am ceaf151a: (-s ours) am 9595965e: am b6f59e35: Merge "Add thead pool size gradle property." into studio-1.3-dev automerge: 54de167 -s ours automerge: e6ff7a9 automerge: afc49c9 by Xavier Ducrohet · 9 years ago
  71. 3a365d1 am e26259bf: am a51bfa2a: (-s ours) am d9524387: am 270db726: Merge "Remove assemble task dependency on native binaries." into studio-1.4-dev automerge: 4ee253c automerge: de6140f by Raymond Chiu · 9 years ago
  72. 2b91696 am bd7ebd12: am b240dc9c: (-s ours) am 47349db6: am 1e4b583c: Merge "180795: @SuppressLint("HandlerLeak") don\'t suppress lint" into studio-1.4-dev automerge: ac3cc5b automerge: 37ff248 by Tor Norbye · 9 years ago
  73. f8a26e1 am 895e6e0b: am be349e19: (-s ours) am 85ff8022: am 9747696c: Merge "resolve merge conflicts of 84da716 to studio-1.4-dev." into studio-1.4-dev automerge: a404a42 automerge: 3d14ed0 by Raymond Chiu · 9 years ago
  74. 61b7250 am dfe6193a: am 27e88492: (-s ours) am 4e262555: am 03f32a0e: Merge changes I75516bf5,I9495cd2c into studio-1.4-dev automerge: da76865 automerge: 849e02a by Raymond Chiu · 9 years ago
  75. de829f1 am f70b150c: am abdc5a79: (-s ours) am 0144ca1e: am 1760ec4d: Merge "Fix dependencies of NDK tasks" into studio-1.4-dev automerge: c32f199 automerge: 8595ae8 by Raymond Chiu · 9 years ago
  76. 053ea04 am 1973a95b: am 6611894b: (-s ours) am 06d4a385: am 1efeaeee: Merge "Make exclude for jni sources work" into studio-1.4-dev automerge: bad4185 automerge: cff3474 by Raymond Chiu · 9 years ago
  77. 4917c52 am f6db13bc: am cad348ba: (-s ours) am fa185dfd: am 08fa77b6: Merge "Make lint unit tests run within the IDE" into studio-1.4-dev automerge: cc45ebc automerge: e0f2a13 by Tor Norbye · 9 years ago
  78. 8a15ea5 am a2bae340: am 36d1ed51: (-s ours) am 78609dde: am 3a3f9fab: Merge "A ProcessOutputHandler for each build step." into studio-1.4-dev automerge: 8be938d automerge: 7c3c6e9 by Chris Warrington · 9 years ago
  79. bac9d9a am efdc4521: am fca9c770: (-s ours) am 9416a180: am 00994986: Merge "Generate PNGs during resource merging." into studio-1.4-dev automerge: cab7a69 automerge: b41a136 by Michal Bendowski · 9 years ago
  80. 680fe9c am 5715016b: am f745ab51: (-s ours) am 5c465206: am b17eca69: Merge "Add new density constant - 360dpi" into studio-1.4-dev automerge: f0fbff3 automerge: 0d69db1 by Griff Hazen · 9 years ago
  81. 7de4fc3 am 2516074b: am 40ac1257: (-s ours) am d2deac14: am 35c84666: Merge "180417: Code inspection does not work when a Lint spelling error occurs" into studio-1.4-dev automerge: 3e48358 automerge: 8107ce2 by Tor Norbye · 9 years ago
  82. 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
  83. 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
  84. 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
  85. 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
  86. 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
  87. 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
  88. 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
  89. 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
  90. 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
  91. 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
  92. 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
  93. 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
  94. 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
  95. 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
  96. 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
  97. 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
  98. 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
  99. 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
  100. 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