Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / base / ad93dc7f5cfda67c1b4043a102f0f3246ee1fef1
  1. ad93dc7 am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev by Vinit Deshapnde · 11 years ago
  2. 9f584e5 am 05b51688: (-s ours) am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev by Matthew Williams · 11 years ago
  3. 2ff9b6a Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  4. 872b036 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  5. e0a2e43 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  6. 6c1ea4b am cace0382: am a9f97a0a: Merge "Page ranges not correct in come cases." into klp-dev by Svetoslav · 11 years ago
  7. 9ef68ec am 8d4816d8: am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev by Dianne Hackborn · 11 years ago
  8. 10914a2 am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev by Vinit Deshapnde · 11 years ago
  9. 05b5168 am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev by Matthew Williams · 11 years ago
  10. cace038 am a9f97a0a: Merge "Page ranges not correct in come cases." into klp-dev by Svetoslav · 11 years ago
  11. 8d4816d am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev by Dianne Hackborn · 11 years ago
  12. 662c326 Merge "Allow yet another combination of key management options" into klp-dev by Vinit Deshapnde · 11 years ago
  13. 7525647 Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev by Matthew Williams · 11 years ago
  14. 2bd9b2c Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  15. a9f97a0 Merge "Page ranges not correct in come cases." into klp-dev by Svetoslav · 11 years ago
  16. e179aa0 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  17. a3abca9 Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev by Dianne Hackborn · 11 years ago
  18. 9bb0ee9 Issue #10461551: KLP API Review: AppOpsManager by Dianne Hackborn · 11 years ago
  19. 8a72458 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  20. af56853 Keep PhoneStatusBar default constructor around. by John Spurlock · 11 years ago
  21. bf00b1a am eafa9c2b: am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev by Dianne Hackborn · 11 years ago
  22. eafa9c2 am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev by Dianne Hackborn · 11 years ago
  23. f9b70ab Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev by Dianne Hackborn · 11 years ago
  24. 2be0093 Debug issue #10876433 java.lang.IllegalStateException... by Dianne Hackborn · 11 years ago
  25. eb5c289 am a817e49e: am dbfceb7e: Merge "Latest UX asset drop, grid padding." into klp-dev by Jeff Sharkey · 11 years ago
  26. a440a0d am b8a48da2: am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev by Jeff Sharkey · 11 years ago
  27. a817e49 am dbfceb7e: Merge "Latest UX asset drop, grid padding." into klp-dev by Jeff Sharkey · 11 years ago
  28. b8a48da am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev by Jeff Sharkey · 11 years ago
  29. dbfceb7 Merge "Latest UX asset drop, grid padding." into klp-dev by Jeff Sharkey · 11 years ago
  30. 5e1a5e5 Merge "Create unique files, root ordering, UI bugs." into klp-dev by Jeff Sharkey · 11 years ago
  31. f17285c am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev by Igor Murashkin · 11 years ago
  32. 8c87117 am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev by Igor Murashkin · 11 years ago
  33. 3ba21e9 Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev by Igor Murashkin · 11 years ago
  34. 7dadd1e am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev by Robert Greenwalt · 11 years ago
  35. 1e690b6 am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev by Robert Greenwalt · 11 years ago
  36. 0983ead Merge "Fix BatchScan request coalesing" into klp-dev by Robert Greenwalt · 11 years ago
  37. 68f4006 camera2: Rename CameraProperties to CameraCharacteristics by Igor Murashkin · 11 years ago
  38. b960357 am 78d5286e: am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev by Igor Murashkin · 11 years ago
  39. 78d5286 am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev by Igor Murashkin · 11 years ago
  40. ca833c3 Merge "camera2: Add capture sequences and capture failures" into klp-dev by Igor Murashkin · 11 years ago
  41. 1feeddf Latest UX asset drop, grid padding. by Jeff Sharkey · 11 years ago
  42. 4d154af am 86ad8e68: am 56065891: Merge commit \'53221120\' into fix-merge-conflict by Wink Saville · 11 years ago
  43. 86ad8e6 am 56065891: Merge commit \'53221120\' into fix-merge-conflict by Wink Saville · 11 years ago
  44. 5545f56 Create unique files, root ordering, UI bugs. by Jeff Sharkey · 11 years ago
  45. 5606589 Merge commit '53221120' into fix-merge-conflict by Wink Saville · 11 years ago
  46. 5322112 am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false) by Wink Saville · 11 years ago
  47. ab8cabf am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false) by Wink Saville · 11 years ago
  48. a4f6409 Page ranges not correct in come cases. by Svetoslav · 11 years ago
  49. 90102e2 resolved conflicts for merge of 1421827b to master by Jonathan Dixon · 11 years ago
  50. 1e4f461 Do not always call setIsConnectedToProvisioningNetwork(false) by Wink Saville · 11 years ago
  51. 1421827 am 6c025eaf: Merge "WebView: add an API method to control web contents debugging" into klp-dev by Jonathan Dixon · 11 years ago
  52. 6c025ea Merge "WebView: add an API method to control web contents debugging" into klp-dev by Jonathan Dixon · 11 years ago
  53. 887a192 am 18e3ca0f: am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev by Svetoslav Ganov · 11 years ago
  54. 18e3ca0 am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev by Svetoslav Ganov · 11 years ago
  55. 678e907e Merge "Update android.print.PrintAttributes documentation" into klp-dev by Svetoslav Ganov · 11 years ago
  56. 9825844 am 7cc82d9f: am ad533927: am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs by David Friedman · 11 years ago
  57. 7cc82d9 am ad533927: am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs by David Friedman · 11 years ago
  58. ad53392 am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs by David Friedman · 11 years ago
  59. 2242344 am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs by David Friedman · 11 years ago
  60. 217683d am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs by David Friedman · 11 years ago
  61. 04cca35 resolved conflicts for merge of cc585f86 to master by Dianne Hackborn · 11 years ago
  62. e124372 Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs by David Friedman · 11 years ago
  63. 6bbf9dc camera2: Add capture sequences and capture failures by Igor Murashkin · 11 years ago
  64. cc585f8 am 88b6e69b: Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev by Dianne Hackborn · 11 years ago
  65. 88b6e69 Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev by Dianne Hackborn · 11 years ago
  66. 2610b7c Fix issue #10863270: procstats UI is showing all green by Dianne Hackborn · 11 years ago
  67. 5f17559 Fixed typo: Added missing word. Bug 10617080 Fixed typo: by David Friedman · 11 years ago
  68. 05a3413 am ff7f43eb: am bb6fd7ff: Merge "Shut. Up." into klp-dev by Dianne Hackborn · 11 years ago
  69. c430e0d am 28db9c64: am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev by Dianne Hackborn · 11 years ago
  70. ff7f43e am bb6fd7ff: Merge "Shut. Up." into klp-dev by Dianne Hackborn · 11 years ago
  71. 28db9c6 am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev by Dianne Hackborn · 11 years ago
  72. bb6fd7f Merge "Shut. Up." into klp-dev by Dianne Hackborn · 11 years ago
  73. 6933734 am 939d9592: am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev by Svetoslav · 11 years ago
  74. 90d51b1 Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev by Dianne Hackborn · 11 years ago
  75. c30d92e Shut. Up. by Dianne Hackborn · 11 years ago
  76. 939d959 am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev by Svetoslav · 11 years ago
  77. abb6fbd Merge "Trace extra headers set by loadurl." by Selim Gurun · 11 years ago
  78. b39ce63 Merge "Offer to enable a print service after it is installed." into klp-dev by Svetoslav · 11 years ago
  79. e784d1e Fix issue #10807048: Groupon: The application crash when user rotates... by Dianne Hackborn · 11 years ago
  80. 90b48b2 Trace extra headers set by loadurl. by Selim Gurun · 11 years ago
  81. d8f391b Offer to enable a print service after it is installed. by Svetoslav · 11 years ago
  82. 5caebe4 am bd842f96: am d8a84a86: Merge "Correct bitmap merging logic" into klp-dev by Chris Craik · 11 years ago
  83. bd842f9 am d8a84a86: Merge "Correct bitmap merging logic" into klp-dev by Chris Craik · 11 years ago
  84. d8a84a8 Merge "Correct bitmap merging logic" into klp-dev by Chris Craik · 11 years ago
  85. 996fe65 Correct bitmap merging logic by Chris Craik · 11 years ago
  86. 0325fc3 am 12618bf7: am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" into klp-dev by Raph Levien · 11 years ago
  87. 12618bf am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" into klp-dev by Raph Levien · 11 years ago
  88. 7c1b108 Merge "Fix for "Can't place cursor after combining accent"" into klp-dev by Raph Levien · 11 years ago
  89. c94a832 am 5b65ad41: am ab98a0b1: Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev by Igor Murashkin · 11 years ago
  90. fb339b8 am 93d3bdb6: am 47d620ac: Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev by destradaa · 11 years ago
  91. 5b65ad4 am ab98a0b1: Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev by Igor Murashkin · 11 years ago
  92. 93d3bdb am 47d620ac: Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev by destradaa · 11 years ago
  93. ab98a0b Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev by Igor Murashkin · 11 years ago
  94. 47d620a Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev by destradaa · 11 years ago
  95. 5fc67f9 am a35ff661: am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev by Adam Lesinski · 11 years ago
  96. f439bcd am 578f67c2: am dfed2448: Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev by Jeff Sharkey · 11 years ago
  97. a35ff66 am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev by Adam Lesinski · 11 years ago
  98. 578f67c am dfed2448: Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev by Jeff Sharkey · 11 years ago
  99. d473ebb Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev by Adam Lesinski · 11 years ago
  100. dfed244 Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev by Jeff Sharkey · 11 years ago