1. 126d89b Merge "resolved conflicts for merge of 7545accf to master" by Elliott Hughes · 9 years ago
  2. c0b8f64 resolved conflicts for merge of 7545accf to master by Elliott Hughes · 9 years ago
  3. ddd7259 Merge "Rename and simplify DisplayList Canvas classes" by Chris Craik · 9 years ago
  4. c9070eb Rename and simplify DisplayList Canvas classes by Chris Craik · 9 years ago
  5. 805f3c9 Add DEPTH image formats, support in ImageReader by Eino-Ville Talvala · 9 years ago
  6. 6291bed am 63d43949: Merge "Use the icu:: namespace for icu4c API." by Elliott Hughes · 9 years ago
  7. 5e3c299 am ea3d53f5: am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties" by Mathieu Chartier · 9 years ago
  8. 4c5806b Use the icu:: namespace for icu4c API. by Elliott Hughes · 9 years ago
  9. 2d08eaf Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""" by Chris Craik · 9 years ago
  10. 1526a45 Revert "Revert "Remove references to SkPorterDuff as it is deprecated."" by Chris Craik · 9 years ago
  11. fdbf68f Merge "Revert "Remove references to SkPorterDuff as it is deprecated."" by Chris Craik · 9 years ago
  12. 26b4f59 Revert "Remove references to SkPorterDuff as it is deprecated." by Chris Craik · 9 years ago
  13. 773bcfa am e59b7ce2: Merge "Add JIT system properties" by Mathieu Chartier · 9 years ago
  14. 6909c0e Add JIT system properties by Mathieu Chartier · 9 years ago
  15. f4faeac Cleanup Bitmap JNI attempt #2 by John Reck · 9 years ago
  16. cd4ed96 emove uncessary include for SkPorterDuff.h (Part 2) by Derek Sollenberger · 9 years ago
  17. 560a433 Merge "Add JNI StaticLayout.Builder" by Raph Levien · 9 years ago
  18. b9a468e Merge "Revert "Cleanup Bitmap JNI"" by Chad Jones · 9 years ago
  19. c02977e Revert "Cleanup Bitmap JNI" by Chad Jones · 9 years ago
  20. 35da7d9 Merge "Cleanup Bitmap JNI" by John Reck · 9 years ago
  21. 4c1f12e Add JNI StaticLayout.Builder by Raph Levien · 9 years ago
  22. b291524 Cleanup Bitmap JNI by John Reck · 9 years ago
  23. a9aded1 Remove references to SkPorterDuff as it is deprecated. by Derek Sollenberger · 9 years ago
  24. d8812ce Add missing paramater to AudioPort jni initialization. by David Stevens · 9 years ago
  25. ba67aee Add fingerprint settings support to the framework by Jim Miller · 9 years ago
  26. 07a65f4 am bbef7cf3: am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read" by Mark Salyzyn · 9 years ago
  27. 012c3b7 am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read" by Mark Salyzyn · 9 years ago
  28. 73f9c7d don't reference (deprecated) kIgnore_SkAlphaType by Mike Reed · 9 years ago
  29. ca50cd2 jni: Add paranoia regarding android_logger_list_read by Mark Salyzyn · 9 years ago
  30. 248ed82 Merge "camera2: Fix local variable names in rgb->ycbcr conversion." by Ruben Brunk · 9 years ago
  31. b11be29 Merge "Glop mesh reorg, support for drawBitmapMesh" by Chris Craik · 9 years ago
  32. ef25074 Glop mesh reorg, support for drawBitmapMesh by Chris Craik · 9 years ago
  33. fc6cd75 am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions." by Dan Albert · 9 years ago
  34. b7121d7 am b78cce6f: Merge "Update autogenerated gl functions." by Dan Albert · 9 years ago
  35. b78cce6 Merge "Update autogenerated gl functions." by Dan Albert · 9 years ago
  36. a49ce66 am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags" by Mark Salyzyn · 9 years ago
  37. 533758c am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags" by Mark Salyzyn · 9 years ago
  38. 18998c9 jni: switch to ANDROID_LOG_* mode flags by Mark Salyzyn · 10 years ago
  39. 10caf03 Update autogenerated gl functions. by Dan Albert · 9 years ago
  40. e1a0858f Merge "Glop layer mesh rendering" by Chris Craik · 9 years ago
  41. ba6adf6 Initial attempt at jank-tracking stat collection by John Reck · 9 years ago
  42. f27133d Glop layer mesh rendering by Chris Craik · 9 years ago
  43. c31dd3b Fingerprint: Adjust to HAL2 spec. by Sasha Levitskiy · 9 years ago
  44. 1ea5736 Merge "Intern strings used in Sensor information." by destradaa · 9 years ago
  45. 346066e am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev by Eino-Ville Talvala · 9 years ago
  46. ad5591f am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev by Eino-Ville Talvala · 9 years ago
  47. b0acf7f Legacy: Only set user surface dimensions on output surfaces by Eino-Ville Talvala · 9 years ago
  48. 9ba7c1c Intern strings used in Sensor information. by destradaa · 9 years ago
  49. 8973597 camera2: Fix local variable names in rgb->ycbcr conversion. by Ruben Brunk · 10 years ago
  50. 89a2466 Check that bitmap's size does not exceed 32 bits. DO NOT MERGE by Leon Scroggins III · 9 years ago
  51. 10804eb Add additional info to AudioPort for enum/selection API. by Paul McLean · 10 years ago
  52. c4e4eef Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas" by Derek Sollenberger · 9 years ago
  53. 9a1eefe1 Merge "AvoidXferMode -> AvoidXfermode." by Leon Scroggins III · 9 years ago
  54. ed1ce37 AvoidXferMode -> AvoidXfermode. by Leon Scroggins III · 9 years ago
  55. 9bf106f Merge "Move SkAvoidXferMode into frameworks/base." by Leon Scroggins III · 9 years ago
  56. 626647c Move SkAvoidXferMode into frameworks/base. by Leon Scroggins III · 9 years ago
  57. c5ea9fa Merge "Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha" by Derek Sollenberger · 9 years ago
  58. d37095b Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha by Derek Sollenberger · 9 years ago
  59. b3d50e0 Rename Canvas::getSkCanvas to Canvas::asSkCanvas by Derek Sollenberger · 9 years ago
  60. 283ddb9 am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev by Leon Scroggins III · 10 years ago
  61. 8475144 am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev by Leon Scroggins III · 10 years ago
  62. a730ef3 Handle bad ninepatch data. by Leon Scroggins III · 10 years ago
  63. 56bbefc Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117f161 by Narayan Kamath · 10 years ago
  64. 1194e75 Merge "Add support for persist.sys.locale." automerge: dca2332 by Narayan Kamath · 10 years ago
  65. d30dbb8 Add support for persist.sys.locale. by Narayan Kamath · 10 years ago
  66. 2ae0733 Remove DisplayListLogBuffer by Chris Craik · 10 years ago
  67. 849911a Move Canvas by John Reck · 10 years ago
  68. 84a6d9e Merge "Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers" by Andy Hung · 10 years ago
  69. d5049e2 am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev by Chris Craik · 10 years ago
  70. 950597d am 31028fa6: am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev by Eino-Ville Talvala · 10 years ago
  71. 04b633c am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev by Chris Craik · 10 years ago
  72. 112e35b4 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev by Chris Craik · 10 years ago
  73. 31028fa am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev by Eino-Ville Talvala · 10 years ago
  74. 17761233 Remove last mention of SkFontHost. by Ben Wagner · 10 years ago
  75. 3b47713 Update generationId on bitmaps when decoded into by BitmapRegionDecoder by Chris Craik · 10 years ago
  76. dbf22cc Merge "Update HWUI to store its own SkBitmap objects" by Derek Sollenberger · 10 years ago
  77. 2c0e17c Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers by Andy Hung · 10 years ago
  78. f913334 Camera: Clarify JNI exception message by Eino-Ville Talvala · 10 years ago
  79. c2d3957 Remove dead code from AssetStreamAdapter. by Ben Wagner · 10 years ago
  80. f462c24 Use at least SkStreamAsset for SkTypefaces. by Ben Wagner · 10 years ago
  81. 1bc109b am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. by Ruben Brunk · 10 years ago
  82. 8f8dc48 resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. by Ruben Brunk · 10 years ago
  83. 8c52d9a Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev by Ruben Brunk · 10 years ago
  84. a3fdec8 Camera2: Fix early EOF in DngCreator#writeByteBuffer. by Ruben Brunk · 10 years ago
  85. 3d4eed7 Update HWUI to store its own SkBitmap objects by Derek Sollenberger · 10 years ago
  86. 304cc53 Use the generic Canvas instead of SkCanvas by Derek Sollenberger · 10 years ago
  87. 93e6d6e am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption" by Andreas Gampe · 10 years ago
  88. 555ea65 am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption" by Andreas Gampe · 10 years ago
  89. 022b1ba Merge "Core/jni: Disallow relocation for decryption" by Andreas Gampe · 10 years ago
  90. 155118f Core/jni: Disallow relocation for decryption by neo.chae · 10 years ago
  91. 40a0709 Merge "Merge frameworks/base changes from master-skia to master." by Tom Hudson · 10 years ago
  92. 152d728 Check for OOM in BitmapFactory's getMimeTypeString(). by Vladimir Marko · 10 years ago
  93. 2e61c04 am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." by Vladimir Marko · 10 years ago
  94. 4e29869 am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." by Vladimir Marko · 10 years ago
  95. 71487eb Merge frameworks/base changes from master-skia to master. by Mike Reed · 10 years ago
  96. f70afa9 am 721d0994: am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." by Narayan Kamath · 10 years ago
  97. 7ab249a Check for OOM in BitmapFactory's getMimeTypeString(). by Vladimir Marko · 10 years ago
  98. 721d099 am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." by Narayan Kamath · 10 years ago
  99. 024191b Merge "Fix comment. It should be 'or' not 'of'." by Narayan Kamath · 10 years ago
  100. 8dfaa49 Make DisplayListRenderer inherit from Canvas, merge JNI by Tom Hudson · 10 years ago