Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / afb1b1aeb61ee8589fccc4b1b786c72b105266a1
  1. afb1b1a Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into cw-f-dev by TreeHugger Robot · 7 years ago
  2. 41ee278 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  3. 407d338 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  4. 16b6bdf Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  5. 28815c5 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  6. d6df52e Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  7. 1d77757 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  8. 0fa3646 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  9. 39a33e2 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  10. 9a738ccc Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  11. 816ddbd Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  12. aa7eca2 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  13. 4cd0777 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  14. 4f9f892 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  15. 2c3e611 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  16. e34cac0 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  17. afac0f4 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e am: c26b8635b7 by Android Build Merger (Role) · 7 years ago
  18. c26b863 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e by Android Build Merger (Role) · 7 years ago
  19. b7f7f7e [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 by Android Build Merger (Role) · 7 years ago
  20. 166aa6e [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 by Android Build Merger (Role) · 7 years ago
  21. a3f0976 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 by Android Build Merger (Role) · 7 years ago
  22. 0ab4540 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 by Android Build Merger (Role) · 7 years ago
  23. e2417e6 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 by Android Build Merger (Role) · 7 years ago
  24. c3d7250 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 by Android Build Merger (Role) · 7 years ago
  25. 5ec65ae Check for null-terminator in ResStringPool::string8At by Adam Lesinski · 7 years ago
  26. 45d9622 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  27. 81b98ff Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  28. 599fb37 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  29. e1ca34b Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  30. 7ce772e Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  31. 1f204cd Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  32. 970261b Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  33. 9593ca1 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  34. 0c1f4c2 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  35. 496af86 Merge "Import translations. DO NOT MERGE" into cw-f-dev by TreeHugger Robot · 7 years ago
  36. 535d958 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  37. 9e967d1 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  38. bb9f50e Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  39. 6e1b59c Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  40. 48f7a99 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  41. c503b8f Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  42. c06ca46 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  43. f2b9a60 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  44. 7bb5638 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  45. 406659b Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  46. 45e18b8 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  47. eb4598a Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 by Adam Vartanian · 7 years ago
  48. 49dfdd6 Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 by Adam Vartanian · 7 years ago
  49. f61daaa Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c by Adam Vartanian · 7 years ago
  50. 3ac5dab Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 by Adam Vartanian · 7 years ago
  51. 240b55d Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e by Adam Vartanian · 7 years ago
  52. 49e5fca Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 by Adam Vartanian · 7 years ago
  53. eee6773 Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 by Adam Vartanian · 7 years ago
  54. 4158c9f Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 by Adam Vartanian · 7 years ago
  55. 6a9c7c4 Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 by Adam Vartanian · 7 years ago
  56. cd6228d Adjust Uri host parsing to use last instead of first @. by Adam Vartanian · 7 years ago
  57. 9422f6e Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf am: eb863a6b2e by Siyamed Sinir · 7 years ago
  58. b353fbc Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf by Siyamed Sinir · 7 years ago
  59. eb863a6 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 by Siyamed Sinir · 7 years ago
  60. eeb9023 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b by Siyamed Sinir · 7 years ago
  61. bc56010 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 by Siyamed Sinir · 7 years ago
  62. 1f85366 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a by Siyamed Sinir · 7 years ago
  63. c275b77 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev by Siyamed Sinir · 7 years ago
  64. a0c253d Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev by Siyamed Sinir · 7 years ago
  65. 5330335 Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 by Chong Zhang · 7 years ago
  66. 396487f Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 by Chong Zhang · 7 years ago
  67. f9e16c9 Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 by Chong Zhang · 7 years ago
  68. 914bc14 Merge "mtp: fix double free of thumbnail data" into nyc-dev by Chong Zhang · 7 years ago
  69. e6b9853 mtp: fix double free of thumbnail data by Chong Zhang · 7 years ago
  70. 76d9732 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 by Jeff Sharkey · 7 years ago
  71. 34e4628 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 by Jeff Sharkey · 7 years ago
  72. 1b40397 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 by Jeff Sharkey · 7 years ago
  73. 832890f DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours by Jeff Sharkey · 7 years ago
  74. c257b61 Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e by Siyamed Sinir · 7 years ago
  75. b049f43 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 by Jeff Sharkey · 7 years ago
  76. 3c30346 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours by Jeff Sharkey · 7 years ago
  77. 9f073ee Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 by Siyamed Sinir · 7 years ago
  78. 73a4e88 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 by Jeff Sharkey · 7 years ago
  79. 7f00f14 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b by Jeff Sharkey · 7 years ago
  80. 3bb6994 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 by Jeff Sharkey · 7 years ago
  81. bf5b9d7 Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 by Siyamed Sinir · 7 years ago
  82. 4dd0194 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 by Beverly Tai · 7 years ago
  83. 1455bd6 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 by Jeff Sharkey · 7 years ago
  84. 4afdfec Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f by Siyamed Sinir · 7 years ago
  85. 2f8dbe9 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb by Jeff Sharkey · 7 years ago
  86. 791d8a5 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef by Beverly Tai · 7 years ago
  87. 2925787 Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b am: d1150b7e55 by Suprabh Shukla · 7 years ago
  88. 74b3298 Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d by Siyamed Sinir · 7 years ago
  89. 901c587 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 by Jeff Sharkey · 7 years ago
  90. a4454ba Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 am: 55ffaea04b by Suprabh Shukla · 7 years ago
  91. 5fda53b Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours by Beverly Tai · 7 years ago
  92. 4c71134 Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 by Siyamed Sinir · 7 years ago
  93. 9c44115 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours by Jeff Sharkey · 7 years ago
  94. 563ea68 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours by Jeff Sharkey · 7 years ago
  95. d1150b7 Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1 by Suprabh Shukla · 7 years ago
  96. bcdb907 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb by Beverly Tai · 7 years ago
  97. 63bb547 Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours by Siyamed Sinir · 7 years ago
  98. 08bd3a7 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours by Jeff Sharkey · 7 years ago
  99. b52056d DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours by Jeff Sharkey · 7 years ago
  100. 55ffaea Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 by Suprabh Shukla · 7 years ago