Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / base / 60c2772ca7aa9d532a3b22e44b298e27204a40a5
  1. 60c2772 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  2. 84791f0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  3. 653efe7 am 6635e269: am e9df511e: DOC: Sync Adapters Android Training by Joe Malin · 11 years ago
  4. 6635e26 am e9df511e: DOC: Sync Adapters Android Training by Joe Malin · 11 years ago
  5. 4c97ad0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  6. e9df511 DOC: Sync Adapters Android Training by Joe Malin · 11 years ago
  7. 1a6fe26 am c63c0682: am e3b94f05: Merge "Track libcore API change." by Elliott Hughes · 11 years ago
  8. c63c068 am e3b94f05: Merge "Track libcore API change." by Elliott Hughes · 11 years ago
  9. e3b94f0 Merge "Track libcore API change." by Elliott Hughes · 11 years ago
  10. 97c538d Track libcore API change. by Elliott Hughes · 11 years ago
  11. b829283 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp by Elliott Hughes · 11 years ago
  12. a920f25 resolved conflicts for merge of fca0f92e to stage-aosp-master by Elliott Hughes · 11 years ago
  13. fca0f92 Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets." by Elliott Hughes · 11 years ago
  14. d1411ef am 324993ab: am 5216f11e: Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  15. d396a44 Switch frameworks/base over from @hidden Charsets to public StandardCharsets. by Elliott Hughes · 11 years ago
  16. 324993a am 5216f11e: Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  17. 5216f11 Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  18. 0e88a95 Track libcore API update. by Elliott Hughes · 11 years ago
  19. 5d2d222 am ce566b50: am ee66531f: Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  20. ce566b5 am ee66531f: Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  21. ee66531 Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  22. 6859af1 Track libcore API update. by Elliott Hughes · 11 years ago
  23. d971caa Fix out of range glCopyTexImage2D Bug #9425270 by Romain Guy · 11 years ago
  24. 937db2d When a new user AID is generated, dump it to dropbox by Amith Yamasani · 11 years ago
  25. f63fdf8 Recreate TextureView's display list on attach Bug #9425270 by Romain Guy · 11 years ago
  26. 46bb6d6 Fix power issues around wifi scans. by Robert Greenwalt · 11 years ago
  27. 34ba52a am a9510297: am 505974eb: Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  28. a951029 am 505974eb: Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  29. 505974e Merge "Track libcore API update." by Elliott Hughes · 11 years ago
  30. 55e789d am ed96349a: am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev by Romain Guy · 11 years ago
  31. ed96349 am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev by Romain Guy · 11 years ago
  32. 3d1b158 Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev by Romain Guy · 11 years ago
  33. 5931afd Track libcore API update. by Elliott Hughes · 11 years ago
  34. 3f0decd am 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev by Amith Yamasani · 11 years ago
  35. 16a2268 am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev by Amith Yamasani · 11 years ago
  36. e6304a9 Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev by Amith Yamasani · 11 years ago
  37. 5cdf7f5 When a new user AID is generated, dump it to dropbox by Amith Yamasani · 11 years ago
  38. b254c24 Fix out of range glCopyTexImage2D Bug #9425270 by Romain Guy · 11 years ago
  39. 67f7d8f am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory" by Kenny Root · 11 years ago
  40. 11b249f am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev by Yorke Lee · 11 years ago
  41. dbfb2ab am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270 by Romain Guy · 11 years ago
  42. 6c042b6 am a5a2de55: Merge "Add ALPN support to SSL socket factory" by Kenny Root · 11 years ago
  43. f6ec304 am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev by Yorke Lee · 11 years ago
  44. 93d4695 am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270 by Romain Guy · 11 years ago
  45. e6cb43a Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev by Yorke Lee · 11 years ago
  46. a5a2de5 Merge "Add ALPN support to SSL socket factory" by Kenny Root · 11 years ago
  47. 67603c6 Recreate TextureView's display list on attach Bug #9425270 by Romain Guy · 11 years ago
  48. 1559d13 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  49. 3d5c109 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  50. c869696 am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev by Robert Greenwalt · 11 years ago
  51. 65f7a95 am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev by Robert Greenwalt · 11 years ago
  52. 2f50097 Merge "Fix power issues around wifi scans." into jb-mr2-dev by Robert Greenwalt · 11 years ago
  53. 100d729 Add ALPN support to SSL socket factory by Kenny Root · 11 years ago
  54. 8971084 Fix power issues around wifi scans. by Robert Greenwalt · 11 years ago
  55. bfc53ab Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  56. 52dbdbf am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread" by John Reck · 11 years ago
  57. 9d2b0db am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread" by John Reck · 11 years ago
  58. 12c4c0e Merge "Fix deadlock of WebViewCoreThread" by John Reck · 11 years ago
  59. 8d41901 Improper initialization of the accessibility manager service. by Svetoslav · 11 years ago
  60. 0cb0a37 am a0b9e1ee: am 99e4a0f5: Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev by Svetoslav · 11 years ago
  61. a0b9e1e am 99e4a0f5: Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev by Svetoslav · 11 years ago
  62. 99e4a0f Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev by Svetoslav · 11 years ago
  63. 3c0cd0b am 34718238: am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app" by Christopher Tate · 11 years ago
  64. 3471823 am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app" by Christopher Tate · 11 years ago
  65. 3e7d034 Merge "Avoid adding FORWARD_LOCK flag to an updated system app" by Christopher Tate · 11 years ago
  66. 5a0f665 am 5b3afe3a: am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout" by Jean-Baptiste Queru · 11 years ago
  67. 2184e3e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  68. 1ff1cd1 Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD by The Android Automerger · 11 years ago
  69. 5b3afe3 am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout" by Jean-Baptiste Queru · 11 years ago
  70. 4be48d4 Merge "Lockscreen : Reference correct layout" by Jean-Baptiste Queru · 11 years ago
  71. 034ed8f Lockscreen : Reference correct layout by Danesh Mondegarian · 11 years ago
  72. 602bc43 am 6d324c82: am f285a709: Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev by Joe Malin · 11 years ago
  73. 6d324c8 am f285a709: Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev by Joe Malin · 11 years ago
  74. f285a70 Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev by Joe Malin · 11 years ago
  75. 66e9a00 am d73e151e: am 3d1c9b07: am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  76. d73e151 am 3d1c9b07: am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  77. 3d1c9b0 am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  78. eadad05 am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  79. d8dff03 am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  80. 1c77f5e am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  81. 1c11139 am 8451fc4f: Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  82. 8451fc4 Doc change: edits to education opt-in docs. by Dirk Dougherty · 11 years ago
  83. 0d4adbe am 0efa541a: am 6561c275: am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  84. 0efa541 am 6561c275: am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  85. 6561c27 am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  86. 6755a4d am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  87. 757b943 am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  88. b2e3fb4 am 9db29158: am f812258e: Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  89. 9db2915 am f812258e: Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  90. f812258 Doc change: add docs for edu opt-in. by Dirk Dougherty · 11 years ago
  91. 83006f5 am aa837ded: am 86c9d47c: update homepage carousel for jelly bean 3.0 by Scott Main · 11 years ago
  92. aa837de am 86c9d47c: update homepage carousel for jelly bean 3.0 by Scott Main · 11 years ago
  93. 86c9d47 update homepage carousel for jelly bean 3.0 by Scott Main · 11 years ago
  94. be46734 am c2d92db8: am bcd6f76a: Merge "typo" into jb-mr2-dev by Scott Main · 11 years ago
  95. c2d92db am bcd6f76a: Merge "typo" into jb-mr2-dev by Scott Main · 11 years ago
  96. 73c1882 am 90e2e8db: am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev by Scott Main · 11 years ago
  97. bcd6f76 Merge "typo" into jb-mr2-dev by Scott Main · 11 years ago
  98. 90e2e8d am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev by Scott Main · 11 years ago
  99. 1c62a0f typo by Scott Main · 11 years ago
  100. 4129cfe Merge "add jb-mr2 api overview" into jb-mr2-dev by Scott Main · 11 years ago