Gitiles
Code Review Sign In
gerrit.witaqua.org / frameworks_base / 9f62bf93709e5f35429e3d1cedb3f99428f3542a
  1. 9f62bf9 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp am: b8ab1d3b12 by Amith Yamasani · 10 years ago
  2. b8ab1d3 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp by Amith Yamasani · 10 years ago
  3. cbef2c7 Merge \\\"Change unit of I/O statistics to MiB\\\" into nyc-dev am: 00681d0e78 am: aebec60aa9 by Tianjie Xu · 10 years ago
  4. ed18ad5 Merge \\\"Change unit of I/O statistics to MiB\\\" into nyc-dev am: 00681d0e78 am: ebfa28ccf8 by Tianjie Xu · 10 years ago
  5. 475171d Merge \\"Change unit of I/O statistics to MiB\\" into nyc-dev am: 00681d0e78 by Tianjie Xu · 10 years ago
  6. c33507d Merge \"Add a separate read permission for oem unlock state\" into nyc-dev by Amith Yamasani · 10 years ago
  7. d889a0a7 Merge \\"Change unit of I/O statistics to MiB\\" into nyc-dev am: 00681d0e78 by Tianjie Xu · 10 years ago
  8. 939efb2 Merge \\"Disable some QS functionality in retail demo mode.\\" into nyc-mr1-dev am: 31a37ed77f by Sudheer Shanka · 10 years ago
  9. aebec60 Merge \"Change unit of I/O statistics to MiB\" into nyc-dev am: 00681d0e78 by Tianjie Xu · 10 years ago
  10. ebfa28c Merge \"Change unit of I/O statistics to MiB\" into nyc-dev am: 00681d0e78 by Tianjie Xu · 10 years ago
  11. 89e65cb Merge "Correct the size of example bitmap for xxhdpi." by Aurimas Liutikas · 10 years ago
  12. 718f321 Merge "Add a separate read permission for oem unlock state" into nyc-dev by Amith Yamasani · 10 years ago
  13. 21d55c3 Merge \"Disable some QS functionality in retail demo mode.\" into nyc-mr1-dev by Sudheer Shanka · 10 years ago
  14. 00681d0 Merge "Change unit of I/O statistics to MiB" into nyc-dev by Tianjie Xu · 10 years ago
  15. c4e64bc Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006 by Makoto Onuki · 10 years ago
  16. 31a37ed Merge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev by Sudheer Shanka · 10 years ago
  17. a3a56ab Merge \"ShortcutManager: deal with changing resource IDs on app update\" into nyc-mr1-dev by Makoto Onuki · 10 years ago
  18. 3bb4366 Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev by Makoto Onuki · 10 years ago
  19. d714e83 Merge \"Merge \\\"docs: Updates for picture-in-picture docs for N DP4\\\" into nyc-dev am: 22dec763a3 am: d05236024e\" into nyc-mr1-dev-plus-aosp by Dan Yu · 10 years ago
  20. 5a793e4 Merge \\\"docs: Updates for picture-in-picture docs for N DP4\\\" into nyc-dev am: 22dec763a3 am: 2473e73e79 by Daniel Yu · 10 years ago
  21. 5f3c868 Merge "Merge \\"docs: Updates for picture-in-picture docs for N DP4\\" into nyc-dev am: 22dec763a3 am: d05236024e" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  22. 22dbfc6 Merge \\"docs: Updates for picture-in-picture docs for N DP4\\" into nyc-dev am: 22dec763a3 by Dan Yu · 10 years ago
  23. 69b2e29 Merge \\"docs: Updates for picture-in-picture docs for N DP4\\" into nyc-dev am: 22dec763a3 by Dan Yu · 10 years ago
  24. d052360 Merge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev by Daniel Yu · 10 years ago
  25. 2473e73 Merge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev by Daniel Yu · 10 years ago
  26. 78d1400 Merge \\"ShortcutManager: Optimize package scanning\\" into nyc-mr1-dev am: 3e27d1254b by Makoto Onuki · 10 years ago
  27. a495123 Merge \"ShortcutManager: Optimize package scanning\" into nyc-mr1-dev by Makoto Onuki · 10 years ago
  28. 22dec76 Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev by Dan Yu · 10 years ago
  29. 3e27d125 Merge "ShortcutManager: Optimize package scanning" into nyc-mr1-dev by Makoto Onuki · 10 years ago
  30. 6438ca6 Merge \"Merge \\\"Make Settings->Apps can handle work apps even work profile not enabled yet\\\" into nyc-dev am: 18c8690b7e am: 711629a27d\" into nyc-mr1-dev-plus-aosp by Ricky Wai · 10 years ago
  31. 8136273 Merge \\\"Make Settings->Apps can handle work apps even work profile not enabled yet\\\" into nyc-dev am: 18c8690b7e am: dfe00c9ed6 by Ricky Wai · 10 years ago
  32. 9e0a9bc Merge "Merge \\"Make Settings->Apps can handle work apps even work profile not enabled yet\\" into nyc-dev am: 18c8690b7e am: 711629a27d" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  33. 304a8d9 Merge \\"Make Settings->Apps can handle work apps even work profile not enabled yet\\" into nyc-dev am: 18c8690b7e by Ricky Wai · 10 years ago
  34. f8c23a5 Merge \\"Make Settings->Apps can handle work apps even work profile not enabled yet\\" into nyc-dev am: 18c8690b7e by Ricky Wai · 10 years ago
  35. 66af2f5 Merge \"Merge \\\"Fix #29073394: Need to bind to scorer after user is unlocked.\\\" into nyc-dev am: 464f7e4983 am: 65cc64dfbc\" into nyc-mr1-dev-plus-aosp by Jeremy Joslin · 10 years ago
  36. 7a74ed8 Merge \\\"Fix #29073394: Need to bind to scorer after user is unlocked.\\\" into nyc-dev am: 464f7e4983 am: 8f1fec3dd2 by Jeremy Joslin · 10 years ago
  37. 5e41f2b Merge "Merge \\"Fix #29073394: Need to bind to scorer after user is unlocked.\\" into nyc-dev am: 464f7e4983 am: 65cc64dfbc" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  38. 711629a Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev by Ricky Wai · 10 years ago
  39. dfe00c9e Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev by Ricky Wai · 10 years ago
  40. 417e47b Merge \\"Fix #29073394: Need to bind to scorer after user is unlocked.\\" into nyc-dev am: 464f7e4983 by Jeremy Joslin · 10 years ago
  41. 1355c63 Merge \\"Fix #29073394: Need to bind to scorer after user is unlocked.\\" into nyc-dev am: 464f7e4983 by Jeremy Joslin · 10 years ago
  42. 8f1fec3 Merge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev by Jeremy Joslin · 10 years ago
  43. 65cc64d Merge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev by Jeremy Joslin · 10 years ago
  44. 18c8690 Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev by Ricky Wai · 10 years ago
  45. 464f7e4 Merge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev by TreeHugger Robot · 10 years ago
  46. 4e9c054 Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 002ccec5c1 -s ours am: e44803dc37 -s ours by Baligh Uddin · 10 years ago
  47. de992a2 Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 002ccec5c1 -s ours am: ee384436c1 -s ours by Baligh Uddin · 10 years ago
  48. 334d5b3 Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: e573989e05 -s ours am: 5b96cafec8 -s ours\" into nyc-mr1-dev-plus-aosp by Baligh Uddin · 10 years ago
  49. c5513aa Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: c20ea2eb43 -s ours am: 26e9a5c9f8 -s ours\" into nyc-mr1-dev-plus-aosp by Baligh Uddin · 10 years ago
  50. 2e12167 Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: e573989e05 -s ours am: 064464251f -s ours\" into nyc-mr1-dev-plus-aosp by Baligh Uddin · 10 years ago
  51. e3d3cb7 Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 64d6fddc4b -s ours am: 25ad61262e -s ours\" into nyc-mr1-dev-plus-aosp by Baligh Uddin · 10 years ago
  52. 9fd8b1a Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: c20ea2eb43 -s ours am: 10b388fe9a -s ours\" into nyc-mr1-dev-plus-aosp by Baligh Uddin · 10 years ago
  53. 5a0972e Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 2d3c74a2fd -s ours am: 74323832de -s ours\" into nyc-mr1-dev-plus-aosp by Baligh Uddin · 10 years ago
  54. 43587bd Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 64d6fddc4b -s ours am: fde831f55d -s ours by Baligh Uddin · 10 years ago
  55. 30e5754 Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 2d3c74a2fd -s ours am: a9cd961151 -s ours by Baligh Uddin · 10 years ago
  56. d3ae644 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 002ccec5c1 -s ours by Baligh Uddin · 10 years ago
  57. b880af5 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 002ccec5c1 -s ours by Baligh Uddin · 10 years ago
  58. 9984197 Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05 -s ours am: 5b96cafec8 -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  59. a6e9d05 Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: c20ea2eb43 -s ours am: 26e9a5c9f8 -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  60. 85e87bd Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05 -s ours am: 064464251f -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  61. 73085fc Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 64d6fddc4b -s ours am: 25ad61262e -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  62. 340eba0 Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: c20ea2eb43 -s ours am: 10b388fe9a -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  63. 73cadc9 Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2d3c74a2fd -s ours am: 74323832de -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 10 years ago
  64. cb79402 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05 -s ours by Baligh Uddin · 10 years ago
  65. 41bbe4f Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: c20ea2eb43 -s ours by Baligh Uddin · 10 years ago
  66. 88d5f5e Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 64d6fddc4b -s ours by Baligh Uddin · 10 years ago
  67. 9d70a4c Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05 -s ours by Baligh Uddin · 10 years ago
  68. 36a7fab Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: c20ea2eb43 -s ours by Baligh Uddin · 10 years ago
  69. 982f0d4 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2d3c74a2fd -s ours by Baligh Uddin · 10 years ago
  70. 8f2006a Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 64d6fddc4b -s ours by Baligh Uddin · 10 years ago
  71. 93f7f8f Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2d3c74a2fd -s ours by Baligh Uddin · 10 years ago
  72. ee38443 Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 002ccec5c1 -s ours by Baligh Uddin · 10 years ago
  73. e44803d Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 002ccec5c1 -s ours by Baligh Uddin · 10 years ago
  74. 0644642 Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: e573989e05 -s ours by Baligh Uddin · 10 years ago
  75. 10b388f Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: c20ea2eb43 -s ours by Baligh Uddin · 10 years ago
  76. fde831f Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 64d6fddc4b -s ours by Baligh Uddin · 10 years ago
  77. a9cd961 Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 2d3c74a2fd -s ours by Baligh Uddin · 10 years ago
  78. 5b96caf Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: e573989e05 -s ours by Baligh Uddin · 10 years ago
  79. 26e9a5c Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: c20ea2eb43 -s ours by Baligh Uddin · 10 years ago
  80. 25ad612 Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 64d6fddc4b -s ours by Baligh Uddin · 10 years ago
  81. 7432383 Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 2d3c74a2fd -s ours by Baligh Uddin · 10 years ago
  82. 002ccec Merge "Import translations. DO NOT MERGE" into nyc-dev by Baligh Uddin · 10 years ago
  83. e573989 Merge "Import translations. DO NOT MERGE" into nyc-dev by Baligh Uddin · 10 years ago
  84. c20ea2e Merge "Import translations. DO NOT MERGE" into nyc-dev by Baligh Uddin · 10 years ago
  85. 64d6fdd Merge "Import translations. DO NOT MERGE" into nyc-dev by Baligh Uddin · 10 years ago
  86. 2d3c74a Merge "Import translations. DO NOT MERGE" into nyc-dev by Baligh Uddin · 10 years ago
  87. 868ec5e Merge \\\"Package changed/removed listeners for always-on VPN\\\" into nyc-dev am: ee5e4cc836 am: e4f8805d6a by Robin Lee · 10 years ago
  88. f0261f1 Merge \\\"Package changed/removed listeners for always-on VPN\\\" into nyc-dev am: ee5e4cc836 am: be16e49f0a by Robin Lee · 10 years ago
  89. b2d7dc1 Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am: ee5e4cc836 by Robin Lee · 10 years ago
  90. ff9f3a0 Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am: ee5e4cc836 by Robin Lee · 10 years ago
  91. e4f8805 Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev by Robin Lee · 10 years ago
  92. be16e49 Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev by Robin Lee · 10 years ago
  93. ee5e4cc Merge "Package changed/removed listeners for always-on VPN" into nyc-dev by TreeHugger Robot · 10 years ago
  94. 7d462b9 Fix the build by Bart Sears · 10 years ago
  95. 2f310da Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev am: 3e2bfbd135 by Lorenzo Colitti · 10 years ago
  96. 3feff13 Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev by Lorenzo Colitti · 10 years ago
  97. 3e2bfbd Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev by TreeHugger Robot · 10 years ago
  98. eab17da Give WakeupMessage the ability to transport an object as well. by Lorenzo Colitti · 10 years ago
  99. 9acda9c Don't treat the lingerExpired broadcast specially. by Lorenzo Colitti · 10 years ago
  100. 762ea7a Add a test for mobile data always on. by Lorenzo Colitti · 10 years ago