Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 86014f06cec0e420e90ac10e96c250a458979869
  1. 86014f06 resolve merge conflicts of 261932b98cb6 to nyc-mr2-dev-plus-aosp am: 0b8e889424 by Erik Kline · 8 years ago
  2. 0b8e889 resolve merge conflicts of 261932b98cb6 to nyc-mr2-dev-plus-aosp by Erik Kline · 8 years ago
  3. 261932b Move TetheringConfiguration out to its own file am: a3d5657027 by Erik Kline · 8 years ago
  4. b334b8f Merge "AAPT: Add support for 'font' resource type" by TreeHugger Robot · 8 years ago
  5. a3d5657 Move TetheringConfiguration out to its own file by Erik Kline · 8 years ago
  6. 2317b64 Merge "AutoSize TextView (part 7) - APIs for configuring auto-size" by Andrei Stingaceanu · 8 years ago
  7. f688b2a Merge changes Idbde7000,Idde3c9d0 into nyc-mr2-dev-plus-aosp am: 767b7ad7dc by Hugo Benichi · 8 years ago
  8. ae42657 DO NOT MERGE ApfFilter: use elapsedRealTime for RA lifetime by Hugo Benichi · 8 years ago
  9. 10f09a4 DO NOT MERGE ApfFilter: systematically use u8, u16, u32 getters by Hugo Benichi · 8 years ago
  10. dca8251 Merge "Add test for updateMobileRequiresDun()" am: 7f018500dc am: 2a3338084a am: 503374c0ae by Erik Kline · 8 years ago
  11. 767b7ad Merge changes Idbde7000,Idde3c9d0 into nyc-mr2-dev-plus-aosp by Hugo Benichi · 8 years ago
  12. 552f562 Merge "Add test for updateMobileRequiresDun()" am: 7f018500dc am: 2a3338084a by Erik Kline · 8 years ago
  13. 503374c Merge "Add test for updateMobileRequiresDun()" am: 7f018500dc am: 2a3338084a by Erik Kline · 8 years ago
  14. 2a33380 Merge "Add test for updateMobileRequiresDun()" am: 7f018500dc by Erik Kline · 8 years ago
  15. 7f01850 Merge "Add test for updateMobileRequiresDun()" by Treehugger Robot · 8 years ago
  16. 973c7df Add test for updateMobileRequiresDun() by Erik Kline · 8 years ago
  17. 1628b97 Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d am: 72c17a7234 am: d0867fb876 by Erik Kline · 8 years ago
  18. 1a816ce Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d am: 72c17a7234 by Erik Kline · 8 years ago
  19. d0867fb Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d by Erik Kline · 8 years ago
  20. 72c17a7 Merge "More concisely export whether we have a "tetherable configuration"" by Erik Kline · 8 years ago
  21. 1b2a1b9 Merge "More concisely export whether we have a "tetherable configuration"" by Treehugger Robot · 8 years ago
  22. 4c0b7cc DO NOT MERGE ApfFilter: use elapsedRealTime for RA lifetime by Hugo Benichi · 8 years ago
  23. c818374 DO NOT MERGE ApfFilter: systematically use u8, u16, u32 getters by Hugo Benichi · 8 years ago
  24. d781fba More concisely export whether we have a "tetherable configuration" by Erik Kline · 8 years ago
  25. 3c682ca Merge "Remove StorageManager#mountAppFuse hidden API." by TreeHugger Robot · 8 years ago
  26. bde6044 Merge "PlayerBase: unregistration in player release" by Jean-Michel Trivi · 8 years ago
  27. baa0116 Remove StorageManager#mountAppFuse hidden API. by Daichi Hirono · 8 years ago
  28. e2a31c0 Merge "Platform support for static shared libraries" by TreeHugger Robot · 8 years ago
  29. 6788212 Platform support for static shared libraries by Svet Ganov · 8 years ago
  30. daca8ee Upstream allowing multiple toasts for focused app by Svet Ganov · 8 years ago
  31. 8e737ef Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 40758bb7d2 -s ours by Bill Yi · 8 years ago
  32. 8f7bb48 Import translations. DO NOT MERGE am: c78569cc23 -s ours by Bill Yi · 8 years ago
  33. f5bae5e Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 96701d3c94 -s ours by Bill Yi · 8 years ago
  34. 98e446e Import translations. DO NOT MERGE am: 7eefc3ed2a -s ours by Bill Yi · 8 years ago
  35. da42c31 Import translations. DO NOT MERGE am: f60d275a45 -s ours by Bill Yi · 8 years ago
  36. 7a2497c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 8 years ago
  37. 6e307f0 Import translations. DO NOT MERGE am: c78569cc23 -s ours by Bill Yi · 8 years ago
  38. 443276f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 8 years ago
  39. d70c407 Import translations. DO NOT MERGE am: 7eefc3ed2a -s ours by Bill Yi · 8 years ago
  40. 1fdaba0 Import translations. DO NOT MERGE am: f60d275a45 -s ours by Bill Yi · 8 years ago
  41. 2383236 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 8 years ago
  42. 40758bb Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 8 years ago
  43. 0140631 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 8 years ago
  44. 96701d3 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 8 years ago
  45. 39e25af Merge "Use infinities for one-sided ranges for a11y." by TreeHugger Robot · 8 years ago
  46. e963003 PlayerBase: unregistration in player release by Jean-Michel Trivi · 8 years ago
  47. f60d275 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  48. 7eefc3e Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  49. c78569c Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  50. a71dec4 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  51. 1a75c19 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  52. 9a33bda Merge "Add @TestApi PopupMenu.getMenuListView" by TreeHugger Robot · 8 years ago
  53. 79e4419 Use infinities for one-sided ranges for a11y. by Phil Weaver · 8 years ago
  54. 05aa9e6 Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev am: e1a7e67dc0 by Christine Franks · 8 years ago
  55. c4fb3e3 DO NOT MERGE - Require password to FR in carrier demo mode am: 319b44e6e9 by Christine Franks · 8 years ago
  56. 20dec7b Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c am: 835db7f6b6 by Amin Shaikh · 8 years ago
  57. 0405386 Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev by Christine Franks · 8 years ago
  58. b196493 DO NOT MERGE - Require password to FR in carrier demo mode am: 319b44e6e9 by Christine Franks · 8 years ago
  59. 17a040d Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c by Amin Shaikh · 8 years ago
  60. e1a7e67 Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev by Christine Franks · 8 years ago
  61. 835db7f Merge "Add Setting for curating saved open networks." am: b3b665de22 by Amin Shaikh · 8 years ago
  62. 2aec2f7 Merge "Add Setting for curating saved open networks." am: b3b665de22 by Amin Shaikh · 8 years ago
  63. e779fd6a Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910 am: 81499754bc am: 46f036c6da by Erik Kline · 8 years ago
  64. 4d77e8b Move several config elements into TetheringConfiguration class am: 3e7566572e am: ec45953fd7 am: befb6a1702 by Erik Kline · 8 years ago
  65. b3b665d Merge "Add Setting for curating saved open networks." by Treehugger Robot · 8 years ago
  66. 2686208 Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev am: f2a54b6a39 -s ours by Jesse Hall · 8 years ago
  67. 50439d4 Load EGL early in Activity launch, instead of in Zygote am: fd104e7fde -s ours by Jesse Hall · 8 years ago
  68. 9bd62de Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910 am: 81499754bc by Erik Kline · 8 years ago
  69. dac4c37 Move several config elements into TetheringConfiguration class am: 3e7566572e am: ec45953fd7 by Erik Kline · 8 years ago
  70. 4d2afaa Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev by Jesse Hall · 8 years ago
  71. e1d0047 Load EGL early in Activity launch, instead of in Zygote am: fd104e7fde -s ours by Jesse Hall · 8 years ago
  72. 46f036c Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910 by Erik Kline · 8 years ago
  73. 8512304 Merge "Address a few unittest comments." am: 9c3a298748 am: d4d464ae2c am: 8de6457414 by Erik Kline · 8 years ago
  74. befb6a1 Move several config elements into TetheringConfiguration class am: 3e7566572e by Erik Kline · 8 years ago
  75. f2a54b6 Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev by TreeHugger Robot · 8 years ago
  76. 8149975 Merge "Move several config elements into TetheringConfiguration class" by Erik Kline · 8 years ago
  77. d870ed9 Merge "Address a few unittest comments." am: 9c3a298748 am: d4d464ae2c by Erik Kline · 8 years ago
  78. ec45953 Move several config elements into TetheringConfiguration class am: 3e7566572e by Erik Kline · 8 years ago
  79. 8de6457 Merge "Address a few unittest comments." am: 9c3a298748 am: d4d464ae2c by Erik Kline · 8 years ago
  80. 8d35276 Merge "Move several config elements into TetheringConfiguration class" by Erik Kline · 8 years ago
  81. d4d464a Merge "Address a few unittest comments." am: 9c3a298748 by Erik Kline · 8 years ago
  82. 9d8e0fc Merge "Rename visibleToEphemeral to visibleToInstantApps" by Chad Brubaker · 8 years ago
  83. 9c3a298 Merge "Address a few unittest comments." by Erik Kline · 8 years ago
  84. 705eedc Merge "Change HFP Client API to support multi device" by Sanket Agarwal · 8 years ago
  85. bc21539 Merge "vibrator HAL uses "default" service name" by Chris Phoenix · 8 years ago
  86. 9a5f9d3 Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev-plus-aosp by Jesse Hall · 8 years ago
  87. af6668b Merge "resolve merge conflicts of 5fa7fb1d9f2a to master" by TreeHugger Robot · 8 years ago
  88. c310a90 vibrator HAL uses "default" service name by Chris Phoenix · 8 years ago
  89. 8533622 Add Setting for curating saved open networks. by Amin Shaikh · 8 years ago
  90. 8850191 Merge "Add Setting for curating saved open networks." by TreeHugger Robot · 8 years ago
  91. 319b44e DO NOT MERGE - Require password to FR in carrier demo mode by Christine Franks · 8 years ago
  92. 5feefa5 Merge "Introduce RescueParty." by TreeHugger Robot · 8 years ago
  93. 655f908 Merge "Added an onDeviceUnlockLockout callback to TrustAgentService." by Zac Iqbal · 8 years ago
  94. 0b0a6b6 Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 8 years ago
  95. c49f2e5 Merge "Add ClipData.addItem(Item, ContentResolver)" by TreeHugger Robot · 8 years ago
  96. 3bb7e5c resolve merge conflicts of 5fa7fb1d9f2a to master by Jesse Hall · 8 years ago
  97. 4cbec88 Merge "Set permissions for launching on private displays" by TreeHugger Robot · 8 years ago
  98. fe6f85c Introduce RescueParty. by Jeff Sharkey · 8 years ago
  99. 3b8eaf3 Merge "Remove style TextAppearance.StatusBar.TextButton" by TreeHugger Robot · 8 years ago
  100. 9614056 Merge "Updating picture-in-picture API." by TreeHugger Robot · 8 years ago