1. 3bae94d resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp by John Reck · 10 years ago
  2. 4f1942d Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev by John Reck · 10 years ago
  3. dad7d84c Teach AssetAtlas about more drawables by John Reck · 10 years ago
  4. 1f78b33 am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev by Derek Sollenberger · 10 years ago
  5. ee648e5 Remove unnecessary/erroneous reference counting by Derek Sollenberger · 10 years ago
  6. e97908d Merge commit '0953ab27' into manualmerge by Adam Lesinski · 10 years ago
  7. a75b0ad resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp by John Reck · 10 years ago
  8. 720beef Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  9. 8e5362f am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" by Adam Lesinski · 10 years ago
  10. 9b624c1 AAPT: Move private attrs to new type for framework by Adam Lesinski · 10 years ago
  11. 01a5ea3 Resume RT-animations after a pauseSurface by John Reck · 10 years ago
  12. a2b5067 Merge "RRO: prevent duplicate system overlays" by Adam Lesinski · 10 years ago
  13. 9438ad1 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c by Adam Lesinski · 10 years ago
  14. e89a286 Merge changes If2c7e09f,Ie21f227c by Adam Lesinski · 10 years ago
  15. a22ab0d am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev by Chris Craik · 10 years ago
  16. ef12488 Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev by Chris Craik · 10 years ago
  17. faa79ff Clip outline to View clip bounds for shadow computation by Chris Craik · 10 years ago
  18. 76de898 Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev by John Reck · 10 years ago
  19. d7af6ea am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface" by John Reck · 10 years ago
  20. a12b240 Prevent calling GL functions with an invalid surface by Sangkyu Lee · 10 years ago
  21. 6afc5cf Merge "Prevent calling GL functions with an invalid surface" by John Reck · 10 years ago
  22. 659de83 Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev by Chris Craik · 10 years ago
  23. e986817 am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev by Chris Craik · 10 years ago
  24. ca84c8b Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev by Chris Craik · 10 years ago
  25. 9f81485 Revert "Force-use the pbuffer surface for destroy" by Chris Craik · 10 years ago
  26. 52b2cf9 Enable stencil clipping within clearLayerRegions by Dohyun Lee · 10 years ago
  27. 0d4ab95 am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev by John Reck · 10 years ago
  28. 1fb141f am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev by Chris Craik · 10 years ago
  29. f76d36f Prevent calling GL functions with an invalid surface by Sangkyu Lee · 10 years ago
  30. ab1a53c am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" by Chris Craik · 10 years ago
  31. dec3f13 Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev by John Reck · 10 years ago
  32. 5ab86ba am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev by John Reck · 10 years ago
  33. ee66065 Merge "Improve DisplayList state output" into lmp-mr1-dev by Chris Craik · 10 years ago
  34. b945f23 Force-use the pbuffer surface for destroy by John Reck · 10 years ago
  35. 71d08a0 Switch TextureCache to SkPixelRef::fStableId by John Reck · 10 years ago
  36. adc0d9d Enable stencil clipping within clearLayerRegions by Dohyun Lee · 10 years ago
  37. ee46d16 am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." by Elliott Hughes · 10 years ago
  38. 9d074a1 We HAVE_LITTLE_ENDIAN. by Elliott Hughes · 10 years ago
  39. b5a5435 Improve DisplayList state output by Chris Craik · 10 years ago
  40. 8b59a52 Revert "Frameworks/base: Unused parameters in hwui" by John Reck · 10 years ago
  41. 90102e1 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev by Chris Craik · 10 years ago
  42. 2ab8298 resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  43. 29dc496 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev by Chris Craik · 10 years ago
  44. 69e6501 Revert "Add a way to override Xfermode DO NOT MERGE" by Chris Craik · 10 years ago
  45. 42ddc18 Frameworks/base: Unused parameters in hwui by Andreas Gampe · 10 years ago
  46. f2235b6 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. by Chris Craik · 10 years ago
  47. 582bdf9 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." by Dan Albert · 10 years ago
  48. 6698749 Add appropriate casts for char16_t. by Dan Albert · 10 years ago
  49. 3b2ba44 Merge "Improve logging around performance critical events" into lmp-mr1-dev by Chris Craik · 10 years ago
  50. 70850ea Improve logging around performance critical events by Chris Craik · 10 years ago
  51. 842697a am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev by John Reck · 10 years ago
  52. f0f68117 Merge "Trace some interesting events" into lmp-mr1-dev by John Reck · 10 years ago
  53. cb82b7f am a58336f6: Merge "Use fabsf() rather than abs()" by Chih-hung Hsieh · 10 years ago
  54. c44958c7 Use fabsf() rather than abs() by Bernhard Rosenkränzer · 10 years ago
  55. 11bdd5b Merge commit '06d8b7b8' into manualmerge by Adam Lesinski · 10 years ago
  56. cd6f00c Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  57. e726680 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" by Marco Nelissen · 10 years ago
  58. fbc8df0 Trace some interesting events by John Reck · 10 years ago
  59. 97069dd Update calls to IInterface::asBinder() by Marco Nelissen · 10 years ago
  60. 6552afa am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev by Rob Tsuk · 10 years ago
  61. 5679d93 am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev by ztenghui · 10 years ago
  62. 41a8043 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev by Rob Tsuk · 10 years ago
  63. b28ff48 resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp by Dan Albert · 10 years ago
  64. 4e50ee4 Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev by ztenghui · 10 years ago
  65. 5e6cf24 Merge "Move frameworks/base over to libc++." by Dan Albert · 10 years ago
  66. 3932063 Shadow: Fix the crash in spot shadow by ztenghui · 10 years ago
  67. 4678dcc Add a way to override Xfermode DO NOT MERGE by Rob Tsuk · 10 years ago
  68. ff1d8a6 Move frameworks/base over to libc++. by Dan Albert · 10 years ago
  69. 7be350d am b93f8d02: Merge "Frameworks/base: Wall Werror in common_time" by Andreas Gampe · 10 years ago
  70. b93f8d02 Merge "Frameworks/base: Wall Werror in common_time" by Andreas Gampe · 10 years ago
  71. 4c57eda Frameworks/base: Wall Werror in common_time by Andreas Gampe · 10 years ago
  72. 6ca8292 am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input" by Andreas Gampe · 10 years ago
  73. 1272887 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  74. c6e992a Merge "Frameworks/base: Wall Werror in libs/input" by Andreas Gampe · 10 years ago
  75. 1d03b81 Merge "Frameworks/base: Wall Werror in libs/hwui" by Andreas Gampe · 10 years ago
  76. 1e19674 Frameworks/base: Wall Werror in libs/hwui by Andreas Gampe · 10 years ago
  77. 6b83b76 Frameworks/base: Wall Werror in libs/input by Andreas Gampe · 10 years ago
  78. 984d81c am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." by Elliott Hughes · 10 years ago
  79. 4da9dc5 bionic's struct stat is now POSIX-compliant. by Elliott Hughes · 10 years ago
  80. 5bbb52e am 189bf056: Merge "Frameworks/base: Fix more warnings" by Andreas Gampe · 10 years ago
  81. 189bf05 Merge "Frameworks/base: Fix more warnings" by Andreas Gampe · 10 years ago
  82. 25df5fb Frameworks/base: Fix more warnings by Andreas Gampe · 10 years ago
  83. 1897a8e am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage" by Andreas Gampe · 10 years ago
  84. 9ade8c1 Merge "Frameworks/base: Wall Werror in libs/storage" by Andreas Gampe · 10 years ago
  85. 83892ec Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  86. dc9c109 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  87. f1923c3 am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev by John Reck · 10 years ago
  88. ca93f69 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev by John Reck · 10 years ago
  89. 2204f0b Frameworks/base: Wall Werror in libs/androidfw by Andreas Gampe · 10 years ago
  90. aa95a88 Have an actual fallback if the surface is lost by John Reck · 10 years ago
  91. cabf8a7 am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev by John Reck · 10 years ago
  92. 4b19b7a Merge "Fix wrong-thread issue" into lmp-mr1-dev by John Reck · 10 years ago
  93. 12f5e34 Fix wrong-thread issue by John Reck · 10 years ago
  94. cb7b63d RRO: prevent duplicate system overlays by Mårten Kongstad · 10 years ago
  95. 96198eb RRO idmap: pad with 0xffffffff, not 0x00000000 by Mårten Kongstad · 10 years ago
  96. 3011313 RRO: reintroduce lost ResTable insert of assets by Mårten Kongstad · 10 years ago
  97. 86f289f am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev by ztenghui · 10 years ago
  98. 7ae6fc8 Merge "A better looking and faster spot shadow." into lmp-mr1-dev by ztenghui · 10 years ago
  99. d2dcd6f A better looking and faster spot shadow. by ztenghui · 10 years ago
  100. be70c77 am 327cb318: Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev automerge: 9c13b8c by John Reck · 10 years ago