1. 2482da6 am 90b089de: (-s ours) am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" by Steve Moyer · 11 years ago
  2. 90b089d am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" by Steve Moyer · 11 years ago
  3. b9d6f6f Merge "DO NOT MERGE: Combine emulator test projects into a single apk" by Steve Moyer · 11 years ago
  4. 0ced06e DO NOT MERGE: Combine emulator test projects into a single apk by Steve Moyer · 11 years ago
  5. 88e1a11 am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"." by Ying Wang · 11 years ago
  6. 680e037 am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"." by Ying Wang · 11 years ago
  7. 59ff600 Merge "Unset _JAVA_OPTIONS before running "java -version"." by Ying Wang · 11 years ago
  8. 8a52b23 Unset _JAVA_OPTIONS before running "java -version". by Ying Wang · 11 years ago
  9. 5fe1b38 am 812d3d47: am 08032409: Add basic support for rendering dynamic content on pages. by Dirk Dougherty · 11 years ago
  10. 812d3d4 am 08032409: Add basic support for rendering dynamic content on pages. by Dirk Dougherty · 11 years ago
  11. 0fd3750 am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" by Greg Hackmann · 11 years ago
  12. f518e83 am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" by Greg Hackmann · 11 years ago
  13. f175087 Merge "Revert "HACK: disable emulator on x86_64"" by Greg Hackmann · 11 years ago
  14. 0803240 Add basic support for rendering dynamic content on pages. by Dirk Dougherty · 11 years ago
  15. 0396b10 am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size" by Colin Cross · 11 years ago
  16. 578f7ec am 45db0e05: Merge "aosp_arm64: increase userdata image size" by Colin Cross · 11 years ago
  17. 45db0e05 Merge "aosp_arm64: increase userdata image size" by Colin Cross · 11 years ago
  18. e4915bb am 59d0c658: am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." by Torne (Richard Coles) · 11 years ago
  19. 59d0c65 am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." by Torne (Richard Coles) · 11 years ago
  20. c783b9b Merge "Add GYP as a target type that requires 2nd arch." by Torne (Richard Coles) · 11 years ago
  21. d46c738 aosp_arm64: increase userdata image size by Colin Cross · 11 years ago
  22. bfc9b30 am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds." by Narayan Kamath · 11 years ago
  23. 81fc969 am cf352c5d: Merge "Add warning message for java6 builds." by Narayan Kamath · 11 years ago
  24. cf352c5 Merge "Add warning message for java6 builds." by Narayan Kamath · 11 years ago
  25. bee0ec4 Add warning message for java6 builds. by Narayan Kamath · 11 years ago
  26. 839d282 am 35200762: am e28df19e: Merge "Call "java[c] -version" only once" by Narayan Kamath · 11 years ago
  27. 823f0ba am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master." by Narayan Kamath · 11 years ago
  28. 3520076 am e28df19e: Merge "Call "java[c] -version" only once" by Narayan Kamath · 11 years ago
  29. 0239220 am 2f5de9f5: Merge "Bring main.mk in sync with master." by Narayan Kamath · 11 years ago
  30. e28df19 Merge "Call "java[c] -version" only once" by Narayan Kamath · 11 years ago
  31. 8d45e51 Call "java[c] -version" only once by Ying Wang · 12 years ago
  32. 2f5de9f Merge "Bring main.mk in sync with master." by Narayan Kamath · 11 years ago
  33. 3972253 Add GYP as a target type that requires 2nd arch. by Torne (Richard Coles) · 11 years ago
  34. 7e28c07 am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly." by Nicolas Geoffray · 11 years ago
  35. 4ca6e2e am 38c0ac73: Merge "Use debug versions of dex2oat explicitly." by Nicolas Geoffray · 11 years ago
  36. 38c0ac7 Merge "Use debug versions of dex2oat explicitly." by Nicolas Geoffray · 11 years ago
  37. 7e739e5 am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags" by Dmitriy Ivanov · 11 years ago
  38. 8369503 am e44e8b0f: Merge "Remove redundant my_target_global_ldflags" by Dmitriy Ivanov · 11 years ago
  39. e44e8b0 Merge "Remove redundant my_target_global_ldflags" by Dmitriy Ivanov · 11 years ago
  40. 00479a9 Remove redundant my_target_global_ldflags by Dmitriy Ivanov · 11 years ago
  41. 7ebce18 am 0cad8ee2: am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM." by Tim Murray · 11 years ago
  42. 0cad8ee am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM." by Tim Murray · 11 years ago
  43. 572e9ac Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM." by Tim Murray · 11 years ago
  44. 125a3c9 Always use prebuilt clang, even if we're explicitly building clang/LLVM. by Tim Murray · 11 years ago
  45. 4888fe3 resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp by Brian Carlstrom · 11 years ago
  46. 31061cc am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div" by Brian Carlstrom · 11 years ago
  47. 5e5d26b am 47e60739: Merge "cortex-a7 supports div" by Brian Carlstrom · 11 years ago
  48. 47e6073 Merge "cortex-a7 supports div" by Brian Carlstrom · 11 years ago
  49. 49c80cd cortex-a7 supports div by Brian Carlstrom · 11 years ago
  50. b6cc842 am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote." by Narayan Kamath · 11 years ago
  51. 2c9552b am aafbbe7e: Merge "Add a default value for ro.zygote." by Narayan Kamath · 11 years ago
  52. aafbbe7 Merge "Add a default value for ro.zygote." by Narayan Kamath · 11 years ago
  53. d5fb782 Bring main.mk in sync with master. by Narayan Kamath · 11 years ago
  54. ed154c3 Use debug versions of dex2oat explicitly. by Nicolas Geoffray · 11 years ago
  55. ff78e65 am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist" by Ying Wang · 11 years ago
  56. 9cfefe1 am 6a9f2b12: Merge "Add intel to the vendor whitelist" by Ying Wang · 11 years ago
  57. 6a9f2b1 Merge "Add intel to the vendor whitelist" by Ying Wang · 11 years ago
  58. 625974c Add intel to the vendor whitelist by Daniel Leung · 11 years ago
  59. f966bda am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set." by Ying Wang · 11 years ago
  60. 4714d3d am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set." by Ying Wang · 11 years ago
  61. cece45d cortex-a7 supports div by Brian Carlstrom · 11 years ago
  62. dc01136 Revert "HACK: disable emulator on x86_64" by Greg Hackmann · 11 years ago
  63. b34af41 Merge "Fix java version detection when _JAVA_OPTIONS is set." by Ying Wang · 11 years ago
  64. bb406bf Fix java version detection when _JAVA_OPTIONS is set. by Peter Ammon · 11 years ago
  65. fc1a735 am 2d0ecc1b: am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants." by Christopher Ferris · 11 years ago
  66. 2d0ecc1 am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants." by Christopher Ferris · 11 years ago
  67. 0c4870a Merge "Specify -mcpu=cortex-a15 for denver CPU variants." by Christopher Ferris · 11 years ago
  68. 1758fe1 am 30dbfa43: am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND" by Ying Wang · 11 years ago
  69. 30dbfa4 am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND" by Ying Wang · 11 years ago
  70. 1c380c1 Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND" by Ying Wang · 11 years ago
  71. f6811ab am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism." by Narayan Kamath · 11 years ago
  72. 9fbd3af am 431b4bb3: Merge "Extend the CPU ABI specification mechanism." by Narayan Kamath · 11 years ago
  73. 431b4bb Merge "Extend the CPU ABI specification mechanism." by Narayan Kamath · 11 years ago
  74. 39fd21a Add a default value for ro.zygote. by Narayan Kamath · 11 years ago
  75. ce1c596 Remove the unnecessary indirection of TARGET_STRIP_COMMAND by Ying Wang · 11 years ago
  76. 7803fde am baa8a1b3: am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000" by Mathieu Chartier · 11 years ago
  77. baa8a1b am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000" by Mathieu Chartier · 11 years ago
  78. 1da02a1 Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000" by Mathieu Chartier · 11 years ago
  79. 1a43b37 Extend the CPU ABI specification mechanism. by Narayan Kamath · 11 years ago
  80. 4a942fb am 35fcac0f: am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen by Scott Main · 11 years ago
  81. 35fcac0 am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen by Scott Main · 11 years ago
  82. 70c9c2d am a36253b8: fix viewport width variable by using underscore instead of hyphen by Scott Main · 11 years ago
  83. a36253b fix viewport width variable by using underscore instead of hyphen by Scott Main · 11 years ago
  84. 9efc18f am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size." by Ying Wang · 11 years ago
  85. da3eec4 am 708242d5: Merge "Increase the maximum javac heap size." by Ying Wang · 11 years ago
  86. 708242d Merge "Increase the maximum javac heap size." by Ying Wang · 11 years ago
  87. 5429cdc am bb3ed6fb: am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs by Scott Main · 11 years ago
  88. 9e81f2c am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite by Scott Main · 11 years ago
  89. bb3ed6f am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs by Scott Main · 11 years ago
  90. 97d326e am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite by Scott Main · 11 years ago
  91. b870291 am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs by Scott Main · 11 years ago
  92. 514c825 am 4b270cdf: Update the sdk templates to support the Android Wear microsite by Scott Main · 11 years ago
  93. 75f21bc Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs by Scott Main · 11 years ago
  94. e921b6d add 2x header logo and add override to viewport width for landing pages. by Scott Main · 11 years ago
  95. 01f11b2 Increase the maximum javac heap size. by Ying Wang · 11 years ago
  96. 4b270cd Update the sdk templates to support the Android Wear microsite by Scott Main · 11 years ago
  97. 441e945 resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp by Colin Cross · 11 years ago
  98. f3e25fe am 007faa43: Merge "add support for LOCAL_MULTILIB" by Colin Cross · 11 years ago
  99. 007faa4 Merge "add support for LOCAL_MULTILIB" by Colin Cross · 11 years ago
  100. e6e48f6 add support for LOCAL_MULTILIB by Colin Cross · 11 years ago