1. 31134cd Merge extensions as published at khronos.org by Jesse Hall · 12 years ago
  2. 0e1e53e am 884e3bc2: (-s ours) am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees by Jamie Gennis · 12 years ago
  3. 884e3bc am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees by Jamie Gennis · 12 years ago
  4. 6426bd6 am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees by Jamie Gennis · 12 years ago
  5. f53f9c6 [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees by Jamie Gennis · 12 years ago
  6. acdbbdc am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  7. 064d252 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  8. 92573f1 atrace: fix the help string by Jamie Gennis · 12 years ago
  9. 46b6bce SurfaceFlinger: work around a driver bug by Jamie Gennis · 12 years ago
  10. 6eea6fb atrace: clean up tracing option enabling by Jamie Gennis · 12 years ago
  11. 4f9fb2b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  12. a436799 am 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" by Jamie Gennis · 12 years ago
  13. 50f8d28 am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" by Jamie Gennis · 12 years ago
  14. d4e7062 am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" by Jamie Gennis · 12 years ago
  15. 7e590a0 am 7df16644: (-s ours) am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async by Jamie Gennis · 12 years ago
  16. 7df1664 am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async by Jamie Gennis · 12 years ago
  17. 2d65928 am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async by Jamie Gennis · 12 years ago
  18. 72c3f7d Revert "ConsumerBase: free buffers outside the lock" by Jamie Gennis · 12 years ago
  19. 2e59d2c DO NOT MERGE GraphicBufferAllocator: make frees async by Jamie Gennis · 12 years ago
  20. f3a736e am 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  21. 7bd5a76 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  22. b5fe96b am 05989772: am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock by Jamie Gennis · 12 years ago
  23. 2fef5c4 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  24. 0598977 am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock by Jamie Gennis · 12 years ago
  25. 3ed2736 am b21a4e3b: ConsumerBase: free buffers outside the lock by Jamie Gennis · 12 years ago
  26. b21a4e3 ConsumerBase: free buffers outside the lock by Jamie Gennis · 12 years ago
  27. 0a73f82 Add LinearAllocator by Chris Craik · 12 years ago
  28. ac0de62 Use LOCAL_REQUIRED_MODULES to establish dependency by Ying Wang · 12 years ago
  29. 653078f utils: clarify scoped tracing functionality by Alex Ray · 12 years ago
  30. c342044 Mark extensions 'Complete', correct some stale version info by Jesse Hall · 12 years ago
  31. 4b3c7fe Remove copy of atrace imported to wrong location by Chad Jones · 12 years ago
  32. 6ce1093 Merge branch 'master' of https://googleplex-android.googlesource.com/a/platform/frameworks/native by Chad Jones · 12 years ago
  33. 797105b Merge "Add the atrace utility." by Chad Jones · 12 years ago
  34. 9a57c5c Merge atrace/ from platform/system/extras to cmds/atrace/ by Chad Jones · 12 years ago
  35. 530c0cf Merge "Initial draft of EGL_ANDROID_image_native_buffer" by Jesse Hall · 12 years ago
  36. 72f3201 Merge "utils: Use cutils tracing functionality." by Alex Ray · 12 years ago
  37. b7e0647 utils: Use cutils tracing functionality. by Alex Ray · 12 years ago
  38. 721192e Initial draft of EGL_ANDROID_image_native_buffer by Jesse Hall · 12 years ago
  39. 7f32b1d Merge "Add LruCache::Iterator" by Romain Guy · 12 years ago
  40. 2b556bc am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  41. 6d93da4 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  42. d98ae61 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  43. f1951df Add LruCache::Iterator by Romain Guy · 12 years ago
  44. e402f1f Add another ifndef and a couple of methods to LruCache by Romain Guy · 12 years ago
  45. 98fc88d Add #ifndef to prevent multiple definitions by Romain Guy · 12 years ago
  46. 7fbe8e1 am 31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  47. 31e8485 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  48. 9913b99 am a7da0dda: am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev by Mathias Agopian · 12 years ago
  49. 9d0e470 am 1e310d64: am 2004307b: Merge "Create builtin display tokens on demand" by Jesse Hall · 12 years ago
  50. 9b60acd am db2e4f16: (-s ours) am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev by Andy McFadden · 12 years ago
  51. a7da0dd am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev by Mathias Agopian · 12 years ago
  52. 98cbec8 am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev by Mathias Agopian · 12 years ago
  53. efd614b Merge "make transform hint multi-display aware" into jb-mr1.1-dev by Mathias Agopian · 12 years ago
  54. 282b79d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  55. 1e310d6 am 2004307b: Merge "Create builtin display tokens on demand" by Jesse Hall · 12 years ago
  56. 2004307 Merge "Create builtin display tokens on demand" by Jesse Hall · 12 years ago
  57. 6edebdf Create builtin display tokens on demand by Jesse Hall · 12 years ago
  58. db2e4f1 am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev by Andy McFadden · 12 years ago
  59. a90173d am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev by Andy McFadden · 12 years ago
  60. 762a6d8 Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev by Andy McFadden · 12 years ago
  61. 378787c DO NOT MERGE - native_fence_sync: fix an enum name by Jamie Gennis · 12 years ago
  62. 333fb79 Merge "native_fence_sync: fix an enum name" by Jamie Gennis · 12 years ago
  63. e346c50 native_fence_sync: fix an enum name by Jamie Gennis · 12 years ago
  64. 1b1e320 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  65. 8430095 make transform hint multi-display aware by Mathias Agopian · 12 years ago
  66. 57cad46 am 0e34af62: am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. by Siva Velusamy · 12 years ago
  67. 0e34af6 am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. by Siva Velusamy · 12 years ago
  68. c859084 am a9a4cd48: gltrace: Make sure device is debuggable. by Siva Velusamy · 12 years ago
  69. a9a4cd4 gltrace: Make sure device is debuggable. by Siva Velusamy · 12 years ago
  70. dd8e58c Merge "gltrace: Make sure device is debuggable." by Siva Velusamy · 12 years ago
  71. 6482fa4 gltrace: Make sure device is debuggable. by Siva Velusamy · 12 years ago
  72. c849b6f Merge "SurfaceFlinger: refactor frame time tracking" by Jamie Gennis · 12 years ago
  73. 588bb08 am b171fe9f: am 594a8773: am 764c197c: fix typo that broke all the builds by Mathias Agopian · 12 years ago
  74. b171fe9 am 594a8773: am 764c197c: fix typo that broke all the builds by Mathias Agopian · 12 years ago
  75. 73d5662 fix typo that broke all the builds by Mathias Agopian · 12 years ago
  76. 82dbc74 SurfaceFlinger: refactor frame time tracking by Jamie Gennis · 12 years ago
  77. 594a877 am 764c197c: fix typo that broke all the builds by Mathias Agopian · 12 years ago
  78. 05dbbb9 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  79. 764c197 fix typo that broke all the builds by Mathias Agopian · 12 years ago
  80. e64b38f Merge "SurfaceFlinger: track the HWC retire fences" by Jamie Gennis · 12 years ago
  81. 87fe15c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  82. 93f838b workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] by Mathias Agopian · 12 years ago
  83. 50cb83f am c763303e: (-s ours) am 92c3a307: am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] by Mathias Agopian · 12 years ago
  84. c763303 am 92c3a307: am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] by Mathias Agopian · 12 years ago
  85. 92c3a30 am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] by Mathias Agopian · 12 years ago
  86. bd3e837 am c208cdd4: am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access by Mathias Agopian · 12 years ago
  87. c208cdd am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access by Mathias Agopian · 12 years ago
  88. 3e095b2 workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] by Mathias Agopian · 12 years ago
  89. 1d3612f am 2a8c49eb: fix an out-of-bounds memory access by Mathias Agopian · 12 years ago
  90. 2ec3e07 SurfaceFlinger: track the HWC retire fences by Jamie Gennis · 12 years ago
  91. 74a474e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  92. 2a8c49e fix an out-of-bounds memory access by Mathias Agopian · 12 years ago
  93. 75220f9 am 35d39886: am f9730c3b: am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare() by Mathias Agopian · 12 years ago
  94. 35d3988 am f9730c3b: am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare() by Mathias Agopian · 12 years ago
  95. f9730c3 am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare() by Mathias Agopian · 12 years ago
  96. 9284fdd Fix build by Glenn Kasten · 12 years ago
  97. 4edbd07 add asynchronous tracing by Erik Gilling · 12 years ago
  98. 2444087 Switch keystore to binder by Kenny Root · 12 years ago
  99. ee932d0 Reset compositionType to HWC_FRAMEBUFFER before calling prepare() by Mathias Agopian · 12 years ago
  100. 42d44e3 am 11dd4b99: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago