Gitiles
Code Review Sign In
gerrit.witaqua.org / frameworks_base / c87cbabf2ea379bea76a11e881dc61ba25829b0b
  1. c87cbab [automerger skipped] Merge "Throw on revoked location permission - framework" am: bb67bab55f -s ours am: af3c1fbef2 -s ours am: 0437633dae -s ours by Nathan Harold · 8 years ago
  2. 2e995e1 [automerger skipped] Merge "Throw on revoked location permission - framework" am: bb67bab55f -s ours am: af3c1fbef2 -s ours by Nathan Harold · 8 years ago
  3. fe330dc resolve merge conflicts of c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master am: 088849fc5e am: f673358b06 by Makoto Onuki · 8 years ago
  4. 0437633 [automerger skipped] Merge "Throw on revoked location permission - framework" am: bb67bab55f -s ours by Nathan Harold · 8 years ago
  5. 0e8c5da resolve merge conflicts of c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master am: 088849fc5e by Makoto Onuki · 8 years ago
  6. af3c1fb [automerger skipped] Merge "Throw on revoked location permission - framework" by Nathan Harold · 8 years ago
  7. f673358 resolve merge conflicts of c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master by Makoto Onuki · 8 years ago
  8. aaaedf2 Merge "Remove unused library dependency" by TreeHugger Robot · 8 years ago
  9. 088849f resolve merge conflicts of c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master by Makoto Onuki · 8 years ago
  10. a93f679 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90 am: 38a6375f99 am: e54e7590d7 by Mathew Inwood · 8 years ago
  11. 4c4dcfa [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f am: 7a10fd6a47 am: 634676e2f9 by Mathew Inwood · 8 years ago
  12. d9f2c30 Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90 am: 38a6375f99 by Mathew Inwood · 8 years ago
  13. 8a810b5 Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f am: 7a10fd6a47 by Mathew Inwood · 8 years ago
  14. de93561 [automerger skipped] resolve merge conflicts of 92b78539e3a177b6f1912474f672db29a211e604 to stage-aosp-master am: 580f86d883 am: 8d1e069091 by Mathew Inwood · 8 years ago
  15. e54e759 Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90 am: 38a6375f99 by Mathew Inwood · 8 years ago
  16. 931ae43 resolve merge conflicts of 92b78539e3a177b6f1912474f672db29a211e604 to stage-aosp-master am: 580f86d883 by Mathew Inwood · 8 years ago
  17. 634676e2 Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f am: 7a10fd6a47 by Mathew Inwood · 8 years ago
  18. 38a6375 Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90 by Mathew Inwood · 8 years ago
  19. 7a10fd6 Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f by Mathew Inwood · 8 years ago
  20. 8d1e069 resolve merge conflicts of 92b78539e3a177b6f1912474f672db29a211e604 to stage-aosp-master by Mathew Inwood · 8 years ago
  21. cf17bf8 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 8 years ago
  22. 9d95b13 [automerger skipped] resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master am: 5346961615 am: 04f16736ae by Mathew Inwood · 8 years ago
  23. 580f86d resolve merge conflicts of 92b78539e3a177b6f1912474f672db29a211e604 to stage-aosp-master by Mathew Inwood · 8 years ago
  24. 035dabc resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master am: 5346961615 by Mathew Inwood · 8 years ago
  25. 04f1673 resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master by Mathew Inwood · 8 years ago
  26. f774fa0 Merge "Add @UnsupportedAppUsage annotations" by TreeHugger Robot · 8 years ago
  27. 52e8f58 Merge "Docs: fixed example in SharedPreferencesBackupHelper" by Benjamin Miller · 8 years ago
  28. 5346961 resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master by Mathew Inwood · 8 years ago
  29. 4ccfedc Merge "[KV] PerformBackupTask => KeyValueBackupTask" by Bernardo Rufino · 8 years ago
  30. 60d71277 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 8 years ago
  31. 32de667 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 8 years ago
  32. b297afe Merge "Mark LocalBluetoothAdapter as obsolete" by TreeHugger Robot · 8 years ago
  33. c144dc1 Merge "Fix screenshot when navigating between tasks" by Issei Suzuki · 8 years ago
  34. 0fe5125 Mark LocalBluetoothAdapter as obsolete by Chienyuan · 8 years ago
  35. 0f1030e Merge "Add a null-check for mScreenBrightnessRampAnimator when dumping" by TreeHugger Robot · 8 years ago
  36. 42c0443 Merge "Fix transition for non-wallpaper activity." by Ming-Shin Lu · 8 years ago
  37. 5293635 Merge "Remove unused fields and move ProfileSelect to Settings" by TreeHugger Robot · 8 years ago
  38. d13067e Merge "Refactor LicenseHtmlLoader to share data w/ Compat verison." by TreeHugger Robot · 8 years ago
  39. 9e795d8 Merge "Magnification isn't reset when service is disabled" by Jackal Guo · 8 years ago
  40. 7f76643 Merge "Fixes a minor typo in ContextHubClient API doc" by TreeHugger Robot · 8 years ago
  41. 05e418c Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 8 years ago
  42. f509490 Merge "Update the accessibility overlay title" by Jackal Guo · 8 years ago
  43. ef85527 Merge "Introduce FontFamily and its builder" by Seigo Nonaka · 8 years ago
  44. 4d7c62b Remove unused library dependency by John Reck · 8 years ago
  45. f0cbf3d Merge "Import translations. DO NOT MERGE" by TreeHugger Robot · 8 years ago
  46. c0670db Merge "Merge "Do not restart tethering while enabling tethering." into pi-dev am: f8f459a2cc am: e115195b2f" by Android Build Merger (Role) · 8 years ago
  47. 8ef3039 Merge "Do not restart tethering while enabling tethering." into pi-dev am: f8f459a2cc by Amin Shaikh · 8 years ago
  48. 95cd0e6 Fixes a minor typo in ContextHubClient API doc by Arthur Ishiguro · 8 years ago
  49. a8f9c8a Merge "Rework slow-query log" by Makoto Onuki · 8 years ago
  50. 971cac7 Merge changes from topic "dynamic_stream_effects_master" by Ari Hausman-Cohen · 8 years ago
  51. e115195 Merge "Do not restart tethering while enabling tethering." into pi-dev by Amin Shaikh · 8 years ago
  52. f8f459a Merge "Do not restart tethering while enabling tethering." into pi-dev by TreeHugger Robot · 8 years ago
  53. bb67bab Merge "Throw on revoked location permission - framework" by Nathan Harold · 8 years ago
  54. 9de8aeb Refactor LicenseHtmlLoader to share data w/ Compat verison. by Fan Zhang · 8 years ago
  55. c8280ca Merge "Bootstrap freeform external displays." by TreeHugger Robot · 8 years ago
  56. e4c7d37 Merge "Expose method to clear all visible recent tasks" by Winson Chung · 8 years ago
  57. 1253e60 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  58. 23baea9 Remove unused fields and move ProfileSelect to Settings by Fan Zhang · 8 years ago
  59. a761d2b Rework slow-query log by Makoto Onuki · 8 years ago
  60. 2ff6ee5 Merge "[automerger skipped] resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master am: db7fd6ee9e am: 6c8ae5f9b8 am: 21b1eb5bb1 -s ours" by Android Build Merger (Role) · 8 years ago
  61. a327a36 [automerger skipped] resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master am: db7fd6ee9e am: 6c8ae5f9b8 by Mathew Inwood · 8 years ago
  62. 9e1c3b7 Merge "Remove dead code" by John Reck · 8 years ago
  63. 410c9d7 Merge "Remove unneccessary #isHardwareAccelerated" by John Reck · 8 years ago
  64. 3ffd795 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e am: dc5ad0b6e6 am: 412a19d69c by Mathew Inwood · 8 years ago
  65. bcd72a5 [automerger skipped] resolve merge conflicts of 1ddeb9e01f34bb4b3fe0ae46f7b37bbfb584d64a to stage-dr1-aosp-master am: 08e080c314 by Mathew Inwood · 8 years ago
  66. d945c31 Merge "Don't keep launcher service continously bound in the foreground" by Winson Chung · 8 years ago
  67. ab2978b Merge changes from topic "package-installer-soong" by Philip P. Moltmann · 8 years ago
  68. 7592128 Merge "Move FlickerTests to frameworks/base/tests 2/2" by TreeHugger Robot · 8 years ago
  69. 56c4148 Throw on revoked location permission - framework by Svet Ganov · 8 years ago
  70. 88930f1 Introduce FontFamily and its builder by Seigo Nonaka · 8 years ago
  71. 21b1eb5 resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master am: db7fd6ee9e by Mathew Inwood · 8 years ago
  72. 84dbd83 Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e am: dc5ad0b6e6 by Mathew Inwood · 8 years ago
  73. 6c8ae5f resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master by Mathew Inwood · 8 years ago
  74. 412a19d Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e am: dc5ad0b6e6 by Mathew Inwood · 8 years ago
  75. 28a4548 resolve merge conflicts of 1ddeb9e01f34bb4b3fe0ae46f7b37bbfb584d64a to stage-dr1-aosp-master by Mathew Inwood · 8 years ago
  76. c02b2ec Merge "use correct userId when startProcess failed" by Makoto Onuki · 8 years ago
  77. e084604 Bootstrap freeform external displays. by Garfield Tan · 8 years ago
  78. db7fd6e resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master by Mathew Inwood · 8 years ago
  79. 08e080c resolve merge conflicts of 1ddeb9e01f34bb4b3fe0ae46f7b37bbfb584d64a to stage-dr1-aosp-master by Mathew Inwood · 8 years ago
  80. 6453ef4 Fix transition for non-wallpaper activity. by lumark · 8 years ago
  81. 058b566 Merge "Add @UnsupportedAppUsage annotations" by Treehugger Robot · 8 years ago
  82. 88e2142 Fix screenshot when navigating between tasks by Issei Suzuki · 8 years ago
  83. 075c81a use correct userId when startProcess failed by gaoshiqi · 8 years ago
  84. dc5ad0b Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e by Mathew Inwood · 8 years ago
  85. 66ef8e8 Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  86. f892a8c Merge "Add @UnsupportedAppUsage annotations" by Treehugger Robot · 8 years ago
  87. 1ddeb9e resolve merge conflicts of 95f8ca9f74b75fda6b05d08d49a1488dd0238c10 to stage-aosp-master by Mathew Inwood · 8 years ago
  88. cc714c1 [KV] PerformBackupTask => KeyValueBackupTask by Bernardo Rufino · 8 years ago
  89. f0c90b1 Add @UnsupportedAppUsage annotations by Mathew Inwood · 8 years ago
  90. 0a9d19c Add @UnsupportedAppUsage annotations by Mathew Inwood · 8 years ago
  91. 7acad5e Add @UnsupportedAppUsage annotations by Mathew Inwood · 8 years ago
  92. 92b7853 Merge "Add @UnsupportedAppUsage annotations" by Treehugger Robot · 8 years ago
  93. 6987a91 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 8 years ago
  94. e20cd73 Merge "Revert "Fix PagedTileLayout reveal animation crash."" by Amin Shaikh · 8 years ago
  95. 13cb8b8 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 8 years ago
  96. 46a48cf Revert "Fix PagedTileLayout reveal animation crash." by Bill Lin · 8 years ago
  97. c4f2ec7 Merge "Allow NotificationAssistantService to suggest smart replies" by TreeHugger Robot · 8 years ago
  98. e87edb1 Merge "Revert^2: Start using new list of non-SDK APIs" by David Brazdil · 8 years ago
  99. 3d8e6e3 Merge "Revert^2: Greylist com.google.vr.platform hidden methods" by David Brazdil · 8 years ago
  100. bcbced4 Merge "Add @UnsupportedAppUsage annotations" by Mathew Inwood · 8 years ago