Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_frameworks_base / fd6df001e096ba26d4d8239c3783e6d5eaf95257
  1. fd6df00 resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev by Wayne Lin · 6 years ago
  2. 6c2376c Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev by Bill Yi · 6 years ago
  3. 318224a [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 by Bill Yi · 6 years ago
  4. e90b1d1 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev by Bill Yi · 6 years ago
  5. 3cd4a34 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5 by Bill Yi · 6 years ago
  6. 9a953b1 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev by Bill Yi · 6 years ago
  7. f7ee9f3f [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 by Bill Yi · 6 years ago
  8. c270ca1 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev by Bill Yi · 6 years ago
  9. 4c4783d [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a by Bill Yi · 6 years ago
  10. a7bdac8 Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev by Bill Yi · 6 years ago
  11. ed50f64 [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 by Bill Yi · 6 years ago
  12. cf751f2 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev by Bill Yi · 6 years ago
  13. 8efa418 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 by Bill Yi · 6 years ago
  14. 6b2064e Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev by Bill Yi · 6 years ago
  15. b551c79 [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae by Bill Yi · 6 years ago
  16. 2e250a6 [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d by Bill Yi · 6 years ago
  17. 3afd4ae Merge "[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control" into oc-dev by Wayne Lin · 6 years ago
  18. 57b2e38 Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev by TreeHugger Robot · 6 years ago
  19. 33be0d8 Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev by TreeHugger Robot · 6 years ago
  20. eb92e99 Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev by TreeHugger Robot · 6 years ago
  21. 1825d87 Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev by TreeHugger Robot · 6 years ago
  22. 8c53c6e Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev by TreeHugger Robot · 6 years ago
  23. d349bd7 Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev by TreeHugger Robot · 6 years ago
  24. 0adf6e1 Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev by TreeHugger Robot · 6 years ago
  25. 5194d05 [DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control by Wayne Lin · 6 years ago
  26. 5bf6376 [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 by Android Build Merger (Role) · 6 years ago
  27. ebf64fa [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 by Android Build Merger (Role) · 6 years ago
  28. 4310d4d Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  29. 2053a11 [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 by Android Build Merger (Role) · 6 years ago
  30. f487edc [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 by Android Build Merger (Role) · 6 years ago
  31. f6e12d6 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  32. fd474f8 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5 by Android Build Merger (Role) · 6 years ago
  33. b5f8896 [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 by Android Build Merger (Role) · 6 years ago
  34. 73a5116 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  35. 0bc9492 [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 by Android Build Merger (Role) · 6 years ago
  36. 853c7ca [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 by Android Build Merger (Role) · 6 years ago
  37. f4b2cb1 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  38. 1e00122 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 by Android Build Merger (Role) · 6 years ago
  39. 5883bd3 [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 by Android Build Merger (Role) · 6 years ago
  40. b19a62b Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  41. 77b8620 [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a by Android Build Merger (Role) · 6 years ago
  42. 110074b [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae by Android Build Merger (Role) · 6 years ago
  43. f40a0a8 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  44. 20ce1f4 [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d by Android Build Merger (Role) · 6 years ago
  45. e50fc63 [automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 by Android Build Merger (Role) · 6 years ago
  46. 6105ad5 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  47. 997014d [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae by Android Build Merger (Role) · 6 years ago
  48. 07dfa0b [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f by Android Build Merger (Role) · 6 years ago
  49. 5587649 Import translations. DO NOT MERGE by Bill Yi · 6 years ago
  50. 5ab6f8b Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev by Atanas Kirilov · 6 years ago
  51. 86fd67a Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev by Atanas Kirilov · 6 years ago
  52. 3bb25f8 Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev by Atanas Kirilov · 6 years ago
  53. 3f2bc41 Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev by Atanas Kirilov · 6 years ago
  54. b908fd8 Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr2-dev by Atanas Kirilov · 6 years ago
  55. e8fea59 Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-dev by Atanas Kirilov · 6 years ago
  56. 7c3c200 Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev by Atanas Kirilov · 6 years ago
  57. 7b08baa Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev by Atanas Kirilov · 6 years ago
  58. 3262a5a Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev by Atanas Kirilov · 6 years ago
  59. 74d82f5 Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev by Atanas Kirilov · 6 years ago
  60. 8f9371a [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 skipped: 90b8425c0b by Android Build Merger (Role) · 6 years ago
  61. 90b8425 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 by Android Build Merger (Role) · 6 years ago
  62. 84b50e6 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 by Android Build Merger (Role) · 6 years ago
  63. db87c89 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 skipped: 50861d59c2 by Android Build Merger (Role) · 6 years ago
  64. 446837c [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe by Android Build Merger (Role) · 6 years ago
  65. bb4dcd1 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." by Atanas Kirilov · 6 years ago
  66. 50861d5 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 by Android Build Merger (Role) · 6 years ago
  67. 79c6a59 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 by Android Build Merger (Role) · 6 years ago
  68. 999e3fe RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." by Atanas Kirilov · 6 years ago
  69. 276f6cb [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be by Android Build Merger (Role) · 6 years ago
  70. 84756be [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 by Android Build Merger (Role) · 6 years ago
  71. 4b00008 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." by Atanas Kirilov · 6 years ago
  72. 94e1a09 [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 by Android Build Merger (Role) · 6 years ago
  73. 95a3e91 RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." by Atanas Kirilov · 6 years ago
  74. 1f5050c Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev by Michael Wachenschwanz · 6 years ago
  75. d32c2a4 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev by TreeHugger Robot · 6 years ago
  76. 78bacb4 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  77. 218f823 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into cw-f-dev by TreeHugger Robot · 6 years ago
  78. 28850f8 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr1-dev by TreeHugger Robot · 6 years ago
  79. e58385a Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-dr1-dev by TreeHugger Robot · 6 years ago
  80. 79ee576 [automerger skipped] Merge "Hide overlay windows when requesting media projection permission." into oc-dev by Wale Ogunwale · 6 years ago
  81. 5c6dd2cd Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev by Wale Ogunwale · 6 years ago
  82. 0d4d38e Merge "Hide overlay windows when requesting media projection permission." into oc-dev by TreeHugger Robot · 6 years ago
  83. d55320b Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev by akirilov · 6 years ago
  84. de95cfe Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  85. d3fd368 Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into cw-f-dev by TreeHugger Robot · 6 years ago
  86. f074e62 Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into nyc-mr1-dev by TreeHugger Robot · 6 years ago
  87. 6b80718 Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into nyc-dr1-dev by TreeHugger Robot · 6 years ago
  88. 471a4e6 Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev by TreeHugger Robot · 6 years ago
  89. 08d2780 Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev by TreeHugger Robot · 6 years ago
  90. 9e6abeb Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into oc-dev by Wale Ogunwale · 6 years ago
  91. d044f7c Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  92. 9b9cbfe Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into cw-f-dev by TreeHugger Robot · 6 years ago
  93. e4ba1b3 Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into nyc-mr1-dev by TreeHugger Robot · 6 years ago
  94. 19edfe6 Merge "RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission." into nyc-dr1-dev by TreeHugger Robot · 6 years ago
  95. 59113c7 Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into oc-dev by TreeHugger Robot · 6 years ago
  96. 15682d0 [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab by akirilov · 6 years ago
  97. ae3a74c Hide overlay windows when requesting media projection permission. by Wale Ogunwale · 7 years ago
  98. f8a7028 [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e skipped: 2e5c1ed2ad by Android Build Merger (Role) · 6 years ago
  99. 2e5c1ed [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e by Android Build Merger (Role) · 6 years ago
  100. 3290f3b [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 by Android Build Merger (Role) · 6 years ago