Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 035dabc2cb3a2142909e1904e724e1a08f8e3746
  1. 035dabc resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master am: 5346961615 by Mathew Inwood · 6 years ago
  2. 04f1673 resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master by Mathew Inwood · 6 years ago
  3. 5346961 resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master by Mathew Inwood · 6 years ago
  4. e115195 Merge "Do not restart tethering while enabling tethering." into pi-dev by Amin Shaikh · 6 years ago
  5. f8f459a Merge "Do not restart tethering while enabling tethering." into pi-dev by TreeHugger Robot · 6 years ago
  6. 21b1eb5 resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master am: db7fd6ee9e by Mathew Inwood · 6 years ago
  7. 84dbd83 Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e am: dc5ad0b6e6 by Mathew Inwood · 6 years ago
  8. 6c8ae5f resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master by Mathew Inwood · 6 years ago
  9. 412a19d Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e am: dc5ad0b6e6 by Mathew Inwood · 6 years ago
  10. 28a4548 resolve merge conflicts of 1ddeb9e01f34bb4b3fe0ae46f7b37bbfb584d64a to stage-dr1-aosp-master by Mathew Inwood · 6 years ago
  11. db7fd6e resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master by Mathew Inwood · 6 years ago
  12. 08e080c resolve merge conflicts of 1ddeb9e01f34bb4b3fe0ae46f7b37bbfb584d64a to stage-dr1-aosp-master by Mathew Inwood · 6 years ago
  13. dc5ad0b Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e by Mathew Inwood · 6 years ago
  14. 1ddeb9e resolve merge conflicts of 95f8ca9f74b75fda6b05d08d49a1488dd0238c10 to stage-aosp-master by Mathew Inwood · 6 years ago
  15. 6987a91 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 6 years ago
  16. 20fcc2e Merge "Add @UnsupportedAppUsage annotations" by Treehugger Robot · 6 years ago
  17. 3b89584 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 6 years ago
  18. 95f8ca9 Merge "Add @UnsupportedAppUsage annotations" by Treehugger Robot · 6 years ago
  19. 47dceea Merge "Telecom: Reset the duration after the CDMA call is accepted" am: 2cbf44dc2f am: e784d5e5ca by Hall Liu · 6 years ago
  20. 2b55fef Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 am: 5d44cf6f72 by Mathew Inwood · 6 years ago
  21. e377a76 Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f am: 02763a1c3e by Mathew Inwood · 6 years ago
  22. 767ce85 Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c50 am: 582d18c02b by Mathew Inwood · 6 years ago
  23. 354e18d Merge "Set initial KSV state after inflation" into pi-dev am: 9d80381ad8 by Lucas Dupin · 6 years ago
  24. a4c0632 Merge "Telecom: Reset the duration after the CDMA call is accepted" am: 2cbf44dc2f by Hall Liu · 6 years ago
  25. a8f3d0c Merge "Change the "since" arguments generation." am: ea77ee39f5 am: 0cb078bba2 by Sundong Ahn · 6 years ago
  26. 37030d9 Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 by Mathew Inwood · 6 years ago
  27. 6493efa Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fafb am: 8f4fdd4e78 by Nathan Harold · 6 years ago
  28. 842e8825 Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f by Mathew Inwood · 6 years ago
  29. 9f0aff0 Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c50 am: 582d18c02b by Mathew Inwood · 6 years ago
  30. d6f6ff3 Merge "Count and Report Bandwidth Requests by UID" am: e1d140619f am: 270e4bb284 by Nathan Harold · 6 years ago
  31. 9d80381 Merge "Set initial KSV state after inflation" into pi-dev by TreeHugger Robot · 6 years ago
  32. 008e32b Merge "Change the "since" arguments generation." am: ea77ee39f5 am: 0cb078bba2 by Sundong Ahn · 6 years ago
  33. f649569 Merge "Idletimer-related commands porting" am: b6b8516ba0 am: db4dace06b by Luke Huang · 6 years ago
  34. 3193926 Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fafb am: 8f4fdd4e78 by Nathan Harold · 6 years ago
  35. e784d5e Merge "Telecom: Reset the duration after the CDMA call is accepted" by Hall Liu · 6 years ago
  36. 36d40b0 Merge "Count and Report Bandwidth Requests by UID" am: e1d140619f am: 270e4bb284 by Nathan Harold · 6 years ago
  37. 5d44cf6 Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 by Mathew Inwood · 6 years ago
  38. f577cdb [automerger skipped] Merge "Have proper permission check in getConfigForSubId" am: c14a4be799 -s ours am: a28ae4d9af -s ours by Malcolm Chen · 6 years ago
  39. 7dc352c Merge "Idletimer-related commands porting" am: b6b8516ba0 am: db4dace06b by Luke Huang · 6 years ago
  40. 02763a1 Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f by Mathew Inwood · 6 years ago
  41. 582d18c Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c50 by Mathew Inwood · 6 years ago
  42. 0cb078b Merge "Change the "since" arguments generation." am: ea77ee39f5 by Sundong Ahn · 6 years ago
  43. f08ee02 [automerger skipped] Merge "Have proper permission check in getConfigForSubId" am: c14a4be799 -s ours by Malcolm Chen · 6 years ago
  44. 8f4fdd4 Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fafb by Nathan Harold · 6 years ago
  45. 270e4bb Merge "Count and Report Bandwidth Requests by UID" am: e1d140619f by Nathan Harold · 6 years ago
  46. db4dace Merge "Idletimer-related commands porting" am: b6b8516ba0 by Luke Huang · 6 years ago
  47. a28ae4d [automerger skipped] Merge "Have proper permission check in getConfigForSubId" by Malcolm Chen · 6 years ago
  48. d967f82 Do not restart tethering while enabling tethering. by Amin Shaikh · 6 years ago
  49. 2cbf44dc Merge "Telecom: Reset the duration after the CDMA call is accepted" by Hall Liu · 6 years ago
  50. 30e50fd Merge "Docs: fixed typo and made minor edits" into pi-dev am: ae3f656146 by Laura Davis · 6 years ago
  51. 9023413 Merge "Docs: fixed typo" into pi-dev am: 63e36667da by Laura Davis · 6 years ago
  52. ae3f656 Merge "Docs: fixed typo and made minor edits" into pi-dev by Laura Davis · 6 years ago
  53. 63e3666 Merge "Docs: fixed typo" into pi-dev by Laura Davis · 6 years ago
  54. 5d669f7 Merge "Code formatting change for upcoming annotations." by Treehugger Robot · 6 years ago
  55. 2845183 Add @UnsupportedAppUsage annotations by Mathew Inwood · 6 years ago
  56. 62992f1 Add @UnsupportedAppUsage annotations by Mathew Inwood · 6 years ago
  57. c092f23 Code formatting change for upcoming annotations. by Mathew Inwood · 6 years ago
  58. 60c8cfd Merge "Code reformatting for upcoming annotations." by Treehugger Robot · 6 years ago
  59. efb4816 Code reformatting for upcoming annotations. by Mathew Inwood · 6 years ago
  60. 35ba945 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 6 years ago
  61. 334317e [automerger skipped] Have proper permission check in getConfigForSubId am: 9afe59bf1c -s ours by Malcolm Chen · 6 years ago
  62. 968ad4f [automerger skipped] Have proper permission check in getConfigForSubId by Malcolm Chen · 6 years ago
  63. 9afe59b Have proper permission check in getConfigForSubId by Malcolm Chen · 6 years ago
  64. ea77ee3 Merge "Change the "since" arguments generation." by Treehugger Robot · 6 years ago
  65. 92b4e46 [automerger skipped] Merge "Add offline/online-sdk-docs in Soong." into stage-aosp-master am: 2a924543f6 by Nan Zhang · 6 years ago
  66. fe75de6 [automerger skipped] Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master am: 6928e50c26 -s ours by Andreas Gampe · 6 years ago
  67. 06a9714 Merge "Add offline/online-sdk-docs in Soong." into stage-aosp-master by Nan Zhang · 6 years ago
  68. 3b71cfc [automerger skipped] Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master by Andreas Gampe · 6 years ago
  69. 2a92454 Merge "Add offline/online-sdk-docs in Soong." into stage-aosp-master by Nan Zhang · 6 years ago
  70. cec3f1f Merge "Pass SdkVersion to getNeighboringCellInfo" by Nathan Harold · 6 years ago
  71. e1d1406 Merge "Count and Report Bandwidth Requests by UID" by Nathan Harold · 6 years ago
  72. e8c8d5e Add @UnsupportedAppUsage annotations by Mathew Inwood · 6 years ago
  73. 9ebe36c Add @UnsupportedAppUsage annotations by Mathew Inwood · 6 years ago
  74. b6b8516b Merge "Idletimer-related commands porting" by Luke Huang · 6 years ago
  75. 2570774 Telecom: Reset the duration after the CDMA call is accepted by Mengjun Leng · 7 years ago
  76. a62d049 Idletimer-related commands porting by Luke Huang · 6 years ago
  77. fd45e5f Count and Report Bandwidth Requests by UID by Nathan Harold · 6 years ago
  78. a381636b Have proper permission check in getConfigForSubId am: 05ab439039 by Malcolm Chen · 6 years ago
  79. 3892d05 Pass SdkVersion to getNeighboringCellInfo by Nathan Harold · 6 years ago
  80. 05ab439 Have proper permission check in getConfigForSubId by Malcolm Chen · 6 years ago
  81. e27c351 Docs: fixed typo and made minor edits by Laura Davis · 6 years ago
  82. 6928e50 Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master by TreeHugger Robot · 6 years ago
  83. c14a4be Merge "Have proper permission check in getConfigForSubId" by Treehugger Robot · 6 years ago
  84. 367d5f5 Merge "Work profile without password shouldn't be locked." into pi-dev by Pavel Grafov · 6 years ago
  85. 614e26d Merge "Work profile without password shouldn't be locked." into pi-dev by TreeHugger Robot · 6 years ago
  86. f1429d7 Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev am: 515700b4fe am: c93b474752 am: b9504e591a by Bill Yi · 6 years ago
  87. 92c747f [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours am: 27c3ba01ff -s ours am: ff99070f78 -s ours by Bill Yi · 6 years ago
  88. 69556e8 Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev am: 515700b4fe am: c93b474752 by Bill Yi · 6 years ago
  89. f5940ac [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours am: 27c3ba01ff -s ours by Bill Yi · 6 years ago
  90. 83f6349 Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev am: d0025407df am: 0834c94a93 am: ab2d9d3e37 by Bill Yi · 6 years ago
  91. 80c1b45 [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours am: 786ae0d322 -s ours am: 3b822cd077 -s ours by Bill Yi · 6 years ago
  92. b9504e5 Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev am: 515700b4fe by Bill Yi · 6 years ago
  93. 105d247 Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev am: d0025407df am: 0834c94a93 by Bill Yi · 6 years ago
  94. ff99070 [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours by Bill Yi · 6 years ago
  95. 424d013 [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours am: 786ae0d322 -s ours by Bill Yi · 6 years ago
  96. ab2d9d3 Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev am: d0025407df by Bill Yi · 6 years ago
  97. c93b474 Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev by Bill Yi · 6 years ago
  98. 27c3ba0 [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb by Bill Yi · 6 years ago
  99. 3b822cd [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours by Bill Yi · 6 years ago
  100. af30b17 [automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f -s ours am: ffe456e49c -s ours am: acdedf3122 -s ours by Bill Yi · 6 years ago