Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 8a902d9f24e83c87b054adb5836b4a5b8a257be9
  1. 8a902d9 resolved conflicts for merge of 220c3f4f to master by Andreas Gampe · 11 years ago
  2. fa6547f am 79ef5ef7: am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev by Jeff Sharkey · 11 years ago
  3. fd72097 am 4c9041cf: am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev by Jeff Brown · 11 years ago
  4. c099f7f am 6d274dc2: am c86f09d7: am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev by Jinsuk Kim · 11 years ago
  5. 244b5d0 am f532871e: am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev by Yigit Boyar · 11 years ago
  6. 72807b2 am d7c5acdf: am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" by Alan Viverette · 11 years ago
  7. 80bf12f am 47379f30: am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" by Alan Viverette · 11 years ago
  8. 2388c81 am 296ea917: am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev by Bryce Lee · 11 years ago
  9. 7cc0a1f am 879a4ee8: Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e automerge: eab3240 by Jim Miller · 11 years ago
  10. 220c3f4 Merge "resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  11. 2ab8298 resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  12. 6bcf223 Merge "Revert "Add a way to override Xfermode"" by Chris Craik · 11 years ago
  13. 79ef5ef am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev by Jeff Sharkey · 11 years ago
  14. da3198a Revert "Add a way to override Xfermode" by Chris Craik · 11 years ago
  15. 54c1127 am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev by Jeff Sharkey · 11 years ago
  16. 158b6c9 resolve merge conflicts of 7d13d9d to master. by Andreas Gampe · 11 years ago
  17. 4c9041c am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev by Jeff Brown · 11 years ago
  18. c0491a2 Merge "Lightweight checkin output for network stats." into lmp-mr1-dev by Jeff Sharkey · 11 years ago
  19. 6d274dc am c86f09d7: am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev by Jinsuk Kim · 11 years ago
  20. 1ac13e0 am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev by Jeff Brown · 11 years ago
  21. c86f09d am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev by Jinsuk Kim · 11 years ago
  22. 682ed6b Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev by Jeff Brown · 11 years ago
  23. 2dafe66 Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev by Jinsuk Kim · 11 years ago
  24. 99377df am d2738ead: Merge "Frameworks/base: Unused parameters in hwui" by Andreas Gampe · 11 years ago
  25. 9ef9401 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev by Jeff Brown · 11 years ago
  26. d2738ea Merge "Frameworks/base: Unused parameters in hwui" by Andreas Gampe · 11 years ago
  27. f532871 am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev by Yigit Boyar · 11 years ago
  28. 1bbaeaa am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev by Yigit Boyar · 11 years ago
  29. d7c5acd am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" by Alan Viverette · 11 years ago
  30. 47379f3 am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" by Alan Viverette · 11 years ago
  31. ace3365 Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev by Yigit Boyar · 11 years ago
  32. e606a78 am 0218970a: Merge "Fix error overwriting when restoring error" by Alan Viverette · 11 years ago
  33. e442e90 am 47172f53: Merge "Use parseColor instead of getHTMLColor" by Alan Viverette · 11 years ago
  34. 0218970 Merge "Fix error overwriting when restoring error" by Alan Viverette · 11 years ago
  35. 47172f5 Merge "Use parseColor instead of getHTMLColor" by Alan Viverette · 11 years ago
  36. 296ea91 am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev by Bryce Lee · 11 years ago
  37. 4d1189e CEC: Enable log for non-user builds by Jinsuk Kim · 11 years ago
  38. deee556 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev by Bryce Lee · 11 years ago
  39. d45cedd Merge "Make default windows features configurable." into lmp-mr1-dev by Bryce Lee · 11 years ago
  40. d6e6e72 Make default windows features configurable. by Bryce Lee · 11 years ago
  41. 879a4ee Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e by Jim Miller · 11 years ago
  42. eab3240 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e by Jim Miller · 11 years ago
  43. 42ddc18 Frameworks/base: Unused parameters in hwui by Andreas Gampe · 11 years ago
  44. 0284e5e Merge "Add multi-sim support to keyguard" into lmp-mr1-dev by Jim Miller · 11 years ago
  45. 7d13d9d resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  46. 5e88177 Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  47. c7cf8cc am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev automerge: 0108d98 by Adrian Roos · 11 years ago
  48. f6a1ef1 am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev by Rubin Xu · 11 years ago
  49. faa5cca am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev by Ruben Brunk · 11 years ago
  50. 3fc5e3c am 2c596a53: Merge "Frameworks/base: Consistency in core/jni" by Andreas Gampe · 11 years ago
  51. f17c1d7 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" by Andreas Gampe · 11 years ago
  52. 2c596a5 Merge "Frameworks/base: Consistency in core/jni" by Andreas Gampe · 11 years ago
  53. ed6b9df Frameworks/base: Consistency in core/jni by Andreas Gampe · 11 years ago
  54. 55a442e Lightweight checkin output for network stats. by Jeff Sharkey · 11 years ago
  55. 935fd8d Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  56. 034b909 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev by Adrian Roos · 11 years ago
  57. 0108d98 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev by Adrian Roos · 11 years ago
  58. 83f2f47 am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev by Rubin Xu · 11 years ago
  59. 307218c resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 11 years ago
  60. 26750711 Merge "Explicitly specify user for public mode" into lmp-mr1-dev by Adrian Roos · 11 years ago
  61. 2847eb7 am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev by Ruben Brunk · 11 years ago
  62. 55a05e4 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev by Rubin Xu · 11 years ago
  63. b90a2f9 Merge "String literals for CL ag/586597" into lmp-mr1-dev by Rubin Xu · 11 years ago
  64. a345b367 am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev by Ruben Brunk · 11 years ago
  65. 55dbf00 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" by Andreas Gampe · 11 years ago
  66. 5d3d53a Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev by Ruben Brunk · 11 years ago
  67. 0991072 am ed368be7: Merge "Frameworks/base: Wall Werror in media/tests" by Andreas Gampe · 11 years ago
  68. 0da1cba am e042791e: Merge "Frameworks/base: Remove unused header" by Andreas Gampe · 11 years ago
  69. ed368be Merge "Frameworks/base: Wall Werror in media/tests" by Andreas Gampe · 11 years ago
  70. e042791 Merge "Frameworks/base: Remove unused header" by Andreas Gampe · 11 years ago
  71. 7f9e014 String literals for CL ag/586597 by Rubin Xu · 11 years ago
  72. ffba290 am 5c374a58: am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  73. ce2552d am 99d983b0: am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev automerge: b3e8ff0 by Zoltan Szatmary-Ban · 11 years ago
  74. 5c374a5 am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  75. 99d983b am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  76. b3d0580 am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  77. b3e8ff0 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  78. 08229e8 Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  79. 0733433 Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev by Zoltan Szatmary-Ban · 11 years ago
  80. 31b844b Explicitly specify user for public mode by Adrian Roos · 11 years ago
  81. 6b0de80 am 416a0b1c: am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev automerge: 934b73f by Paul Jensen · 11 years ago
  82. 416a0b1 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev by Paul Jensen · 11 years ago
  83. 934b73f am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev by Paul Jensen · 11 years ago
  84. 0653f50 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev by Paul Jensen · 11 years ago
  85. 9a59747 am e400f811: am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f by Geoffrey Borggaard · 11 years ago
  86. dc12af4 am 0b3963e3: am d9e6f658: am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 by Ricardo Cervera · 11 years ago
  87. 537c91e am bc250401: am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 by Ricardo Cervera · 11 years ago
  88. b898936a am 5a429758: am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 by Filip Gruszczynski · 11 years ago
  89. eeb06d9 am a1c2b6a9: am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b automerge: 5a75a66 by Andrew Solovay · 11 years ago
  90. 021b03c am 7e28e78b: am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 automerge: 889a259 by Elliott Hughes · 11 years ago
  91. 36dfe4c am 448d1ffc: am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a automerge: 1896e58 by Dirk Dougherty · 11 years ago
  92. 845e81e am 2dc4cfa0: am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 automerge: 39d6b21 by smain@google.com · 11 years ago
  93. 5bd45a667 am 5b51858d: am ecccf10b: am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 by Quddus Chong · 11 years ago
  94. 7cfcfba am fbff0191: am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df by Deepanshu Gupta · 11 years ago
  95. 3dd0d90 am 7676f576: am b4a23798: am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours by Deepanshu Gupta · 11 years ago
  96. 46803a4 am dc3e7d28: am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev by John Spurlock · 11 years ago
  97. 972b140 am 5b0528b5: am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev by Christopher Tate · 11 years ago
  98. d679cf0 am ac280c48: am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev automerge: fa4eba9 by Alan Viverette · 11 years ago
  99. ced4c82 am a35d07a4: am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev automerge: 69b802f by Alan Viverette · 11 years ago
  100. caff64d am 676b1d88: am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev automerge: c43613b by Dianne Hackborn · 11 years ago