Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / tools / base / refs/heads/int/p/fp2
  1. d467010 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
  2. 501805b 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
  3. 41cfd24 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
  4. 32a660b 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
  5. cc300c6 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
  6. eac4805 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
  7. cbdbbd6 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
  8. a2b605a 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
  9. ddb4b7f 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
  10. a4cafb5 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
  11. 555d10a 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
  12. 611d238 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
  13. 76ae24d 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
  14. ff3940b 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
  15. 242ab5a 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
  16. 7da949b 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
  17. 5bcd4c7 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
  18. a3d3eb2 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
  19. 644027a 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
  20. 5b6a409 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
  21. 0baf42f 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
  22. 84dbd57 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
  23. b1bbb94 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
  24. e27d66d 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
  25. c85bec6 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
  26. 66a819a 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
  27. a319973 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
  28. 884a90e 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
  29. dd2b0f4 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
  30. 0437e34 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
  31. f9e55b2 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
  32. 72dfc3a 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
  33. 78a66e6 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
  34. e26259b 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
  35. bd7ebd1 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
  36. 895e6e0 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
  37. dfe6193 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
  38. f70b150 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
  39. 1973a95 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
  40. f6db13b 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
  41. a2bae34 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
  42. efdc452 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
  43. 5715016 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
  44. 2516074 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
  45. 2d51e75 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
  46. 04c9e3f 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
  47. 8e56b62 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
  48. b963c3a 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
  49. f1d0663 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
  50. e8fbb7e 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
  51. ab5adb9 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
  52. 671c9d6 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
  53. 83f6470 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
  54. d0e6489 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
  55. 1ddfd28 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
  56. 00a8358 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
  57. 39c2056 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
  58. 0a4dc67 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
  59. 534ea3b 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
  60. d240ddc 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
  61. f9d7032 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
  62. db629bf 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
  63. 68c8852 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
  64. 5fb0e26 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
  65. 4eff88a 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
  66. 973b4fe 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
  67. fb1ac8b 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
  68. 17eefa9 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
  69. 9bddca6 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
  70. 672f6dd 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
  71. 9bffbeb 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
  72. fd0f459 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
  73. fbf6eff 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
  74. d528d07 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
  75. d8f4177 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
  76. 7f4d43c 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
  77. 483275d 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
  78. 1a2b734 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
  79. 42d9c0b 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
  80. 9c293b2 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
  81. 378306f 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
  82. 3ba649b 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
  83. 36340ce 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
  84. fb4d998 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
  85. 53eb2ee 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
  86. 273994b 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
  87. b075d67 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
  88. a934fc4 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
  89. 936505a 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
  90. 360786f 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
  91. a83a9a0 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
  92. 11f1d5e 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
  93. 582d43f 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
  94. db087dd 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
  95. b66b48b 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
  96. bafa455 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
  97. 8dc4835 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
  98. 3c3a140 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
  99. d8f5d2a 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
  100. c0bc3f6 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