1. 3eb0ff8 resolve merge conflicts of 9cfab69e071c9cf9896a3ffb0a72b0e76363b44b to master by Vikas Marwaha · 6 years ago
  2. 81b5b0a resolve merge conflicts of 9cfab69e071c9cf9896a3ffb0a72b0e76363b44b to master by Vikas Marwaha · 6 years ago
  3. 46e9879 resolve merge conflicts of b7b7cee2f18f4b0e604dfa9cb4684912693f26ae to oc-mr1-dev-plus-aosp by sachiyo · 6 years ago
  4. 1bbec09 resolve merge conflicts of 11e66338a17f9c3154758833549e11fc6864c9cf to oc-mr1-dev-plus-aosp by sachiyo · 6 years ago
  5. 5f60238 resolve merge conflicts of 11e66338a17f9c3154758833549e11fc6864c9cf to oc-mr1-dev-plus-aosp by sachiyo · 6 years ago
  6. b7b7cee Merge "Docs: Move requirements for pinned widgets to dedicated widgets section" into oreo-dev am: 4383b16906 by Sachiyo Sugimoto · 6 years ago
  7. 11e6633 resolve merge conflicts of 45bcfaf7a1b208ad21c8ba0c9cc8a75c6feeb6f6 to master by sachiyo · 6 years ago
  8. 9cfab69 Doc: Update requirement IDs for Section 2 by sachiyo · 7 years ago
  9. 958b878 Merge "Docs: Move requirements for pinned widgets to dedicated widgets section" into oreo-dev by Sachiyo Sugimoto · 6 years ago
  10. 7a949af resolve merge conflicts of 45bcfaf7a1b208ad21c8ba0c9cc8a75c6feeb6f6 to master by sachiyo · 6 years ago
  11. bfa0ecb [automerger] Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf am: db91a8fa89 -s ours am: aab3a41aff am: 98eb42dbf9 am: 5bf7b39db0 by Android Build Merger (Role) · 6 years ago
  12. 11e813b [automerger] Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf am: db91a8fa89 -s ours am: aab3a41aff am: 98eb42dbf9 by Android Build Merger (Role) · 6 years ago
  13. 5bf7b39 [automerger] Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf am: db91a8fa89 -s ours am: aab3a41aff am: 98eb42dbf9 by Android Build Merger (Role) · 6 years ago
  14. 98eb42d [automerger] Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf am: db91a8fa89 -s ours am: aab3a41aff by Android Build Merger (Role) · 6 years ago
  15. aab3a41 Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf by Sachiyo Sugimoto · 6 years ago
  16. bcdb231 [automerger] Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 am: c53268693c am: 93e1223544 -s ours am: 9abaf8b016 am: 6f0749b91f am: 23df259fed by Android Build Merger (Role) · 6 years ago
  17. 560afff [automerger] Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 am: c53268693c am: 93e1223544 -s ours am: 9abaf8b016 am: 6f0749b91f by Android Build Merger (Role) · 6 years ago
  18. 23df259 [automerger] Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 am: c53268693c am: 93e1223544 -s ours am: 9abaf8b016 am: 6f0749b91f by Android Build Merger (Role) · 6 years ago
  19. 6f0749b [automerger] Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 am: c53268693c am: 93e1223544 -s ours am: 9abaf8b016 by Android Build Merger (Role) · 6 years ago
  20. 9abaf8b Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 am: c53268693c by Sachiyo Sugimoto · 6 years ago
  21. db91a8f Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e by Sachiyo Sugimoto · 6 years ago
  22. ecb97cc Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 by Sachiyo Sugimoto · 6 years ago
  23. 4fb8b88 Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d by Sachiyo Sugimoto · 6 years ago
  24. 77342f5 Merge "Docs: Fix typo 'UIR' should be 'URI'" into oreo-dev am: a7d05f305e am: a624892dd1 am: 00b24a83da by Sachiyo Sugimoto · 6 years ago
  25. 5e7bb42 Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev by Sachiyo Sugimoto · 6 years ago
  26. 93e1223 Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 by Sachiyo Sugimoto · 6 years ago
  27. ce7f9a3 Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev by Sachiyo Sugimoto · 6 years ago
  28. c532686 Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 by Sachiyo Sugimoto · 6 years ago
  29. 166a8f9 Merge "Docs: Fix typo 'UIR' should be 'URI'" into oreo-dev am: a7d05f305e am: a624892dd1 by Sachiyo Sugimoto · 6 years ago
  30. 3840033 Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 by Sachiyo Sugimoto · 6 years ago
  31. 00b24a8 Merge "Docs: Fix typo 'UIR' should be 'URI'" into oreo-dev am: a7d05f305e by Sachiyo Sugimoto · 6 years ago
  32. e069b9d Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev by Sachiyo Sugimoto · 6 years ago
  33. 472ba43 Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev by Sachiyo Sugimoto · 6 years ago
  34. 4383b16 Merge "Docs: Move requirements for pinned widgets to dedicated widgets section" into oreo-dev by Sachiyo Sugimoto · 6 years ago
  35. a624892 Merge "Docs: Fix typo 'UIR' should be 'URI'" into oreo-dev am: a7d05f305e by Sachiyo Sugimoto · 6 years ago
  36. 45bcfaf Merge "Docs: Add back memory requirements for Television and Automotive" into oreo-dev by Sachiyo Sugimoto · 6 years ago
  37. a7d05f3 Merge "Docs: Fix typo 'UIR' should be 'URI'" into oreo-dev by Sachiyo Sugimoto · 6 years ago
  38. 945fb9b Docs: Move requirements for pinned widgets to dedicated widgets section by sachiyo · 7 years ago
  39. 5cc595f Merge "Docs: Change title & remove outdated contact email." am: 4cc6ccbeee am: 13c12bd0ad by Gina Dimino · 7 years ago
  40. 4f282e2 Merge "Docs: Change title & remove outdated contact email." am: 4cc6ccbeee by Gina Dimino · 7 years ago
  41. 13c12bd Merge "Docs: Change title & remove outdated contact email." am: 4cc6ccbeee by Gina Dimino · 7 years ago
  42. 4cc6ccb Merge "Docs: Change title & remove outdated contact email." by Gina Dimino · 7 years ago
  43. 8277ab5 resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev am: dd18bb37c6 am: ecb9d52287 am: 5e5d6beb8c am: ecabc487af am: a92e1cec99 am: edf974412b am: e9bb12a0e0 by Clay Murphy · 7 years ago
  44. 01ec0e2 resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev am: dd18bb37c6 am: ecb9d52287 am: 5e5d6beb8c am: ecabc487af am: a92e1cec99 am: edf974412b by Clay Murphy · 7 years ago
  45. e9bb12a resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev am: dd18bb37c6 am: ecb9d52287 am: 5e5d6beb8c am: ecabc487af am: a92e1cec99 by Clay Murphy · 7 years ago
  46. edf9744 resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev am: dd18bb37c6 am: ecb9d52287 am: 5e5d6beb8c am: ecabc487af by Clay Murphy · 7 years ago
  47. a92e1ce resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev am: dd18bb37c6 am: ecb9d52287 am: 5e5d6beb8c by Clay Murphy · 7 years ago
  48. ecabc48 resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev am: dd18bb37c6 am: ecb9d52287 by Clay Murphy · 7 years ago
  49. 5e5d6be resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev am: dd18bb37c6 by Clay Murphy · 7 years ago
  50. ecb9d52 resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev by Clay Murphy · 7 years ago
  51. dd18bb3 resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev by Clay Murphy · 7 years ago
  52. 640049f Docs: Add back the dropped req for CHANGE_PHONE_ACCOUNTS intent am: e300b24340 by sachiyo · 7 years ago
  53. ad58410 Docs: Add back the dropped req for CHANGE_PHONE_ACCOUNTS intent am: e300b24340 by sachiyo · 7 years ago
  54. e300b24 Docs: Add back the dropped req for CHANGE_PHONE_ACCOUNTS intent by sachiyo · 7 years ago
  55. 614f3a3 CDD: Relax CDD section 7.2.3 visibility requirement for nav functions by sachiyo · 7 years ago
  56. 4e5cab4 Manually merge changes from giant AOSP topic by Stephen Li · 7 years ago
  57. 01ea00a DO NOT MERGE: Merge Oreo MR1 into master am: be7845704f -s ours am: 6d8c178dbc by Xin Li · 7 years ago
  58. 6d8c178 DO NOT MERGE: Merge Oreo MR1 into master am: be7845704f -s ours by Xin Li · 7 years ago
  59. be78457 DO NOT MERGE: Merge Oreo MR1 into master by Xin Li · 7 years ago
  60. 2593bd7 Merge "CDD: Reduce the required number of activities in the recents" into oc-mr1-dev am: 8ad7b0ba00 -s ours by Vikas Marwaha · 7 years ago
  61. 799670c CDD: Reduce the required number of activities in the recents am: 788965e302 by Christian Bejram · 7 years ago
  62. 66dfd1d Merge "CDD: Clarify the storage / memory requirement for low-memory handheld devices" into oc-mr1-dev am: 9567dfd86c by Vikas Marwaha · 7 years ago
  63. 4e9e5ad Merge "CDD: Reduce the required number of activities in the recents" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  64. 8ad7b0b Merge "CDD: Reduce the required number of activities in the recents" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  65. 94fa0df CDD: Reduce the required number of activities in the recents by Christian Bejram · 7 years ago
  66. 788965e CDD: Reduce the required number of activities in the recents by Christian Bejram · 7 years ago
  67. 66e4874 Merge "CDD: Clarify the storage / memory requirement for low-memory handheld devices" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  68. 9567dfd Merge "CDD: Clarify the storage / memory requirement for low-memory handheld devices" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  69. 4357f41 CDD: Clarify the storage / memory requirement for low-memory handheld devices by sachiyo · 7 years ago
  70. 9a3ed22 CDD: Clarify the storage / memory requirement for low-memory handheld devices by sachiyo · 7 years ago
  71. bbd517a CDD: Update the requirement condition to require supporting the settings intent am: 6c89919525 by sachiyo · 7 years ago
  72. 69c0648 CDD: Update the requirement condition to require supporting the settings intent by sachiyo · 7 years ago
  73. 6c89919 CDD: Update the requirement condition to require supporting the settings intent by sachiyo · 7 years ago
  74. 7fc1de7 Merge "Docs: Fix the wrong CDD IDs" into oc-mr1-dev am: f59cf05ca6 by Vikas Marwaha · 7 years ago
  75. d90225a Merge "CDD: Require verified boot when device has enough RAM vs. good AES-crypto performance" into oc-mr1-dev am: 3028793cd4 by Vikas Marwaha · 7 years ago
  76. 8280955 Merge "CDD: Require App Shortcuts when pinned shortcuts are supported" into oc-mr1-dev am: 3f2dc2721d by Vikas Marwaha · 7 years ago
  77. 3c340d4 Merge "Docs: Fix the wrong CDD IDs" into oc-mr1-dev am: f59cf05ca6 by Vikas Marwaha · 7 years ago
  78. e56a755 Merge "CDD: Require verified boot when device has enough RAM vs. good AES-crypto performance" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  79. f9b56b9 Merge "CDD: Require App Shortcuts when pinned shortcuts are supported" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  80. f59cf05 Merge "Docs: Fix the wrong CDD IDs" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  81. 1de2ffc Merge "CDD: Require secure storage of lock screen credentials" into oc-mr1-dev am: 0ea6e466a7 by Vikas Marwaha · 7 years ago
  82. bb694b7 Merge "CDD: Add CDD language for CHANGE_PHONE_ACCOUNTS intent." into oc-mr1-dev am: 233d9c02a5 by Vikas Marwaha · 7 years ago
  83. 3028793 Merge "CDD: Require verified boot when device has enough RAM vs. good AES-crypto performance" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  84. 3f2dc27 Merge "CDD: Require App Shortcuts when pinned shortcuts are supported" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  85. 2d5a468 Merge "CDD: Require secure storage of lock screen credentials" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  86. 3f4a6b1 Merge "CDD: Add CDD language for CHANGE_PHONE_ACCOUNTS intent." into oc-mr1-dev by Vikas Marwaha · 7 years ago
  87. 0ea6e46 Merge "CDD: Require secure storage of lock screen credentials" into oc-mr1-dev by Vikas Marwaha · 7 years ago
  88. 233d9c0 Merge "CDD: Add CDD language for CHANGE_PHONE_ACCOUNTS intent." into oc-mr1-dev by Vikas Marwaha · 7 years ago
  89. 8ca147b CDD: Add CDD language for CHANGE_PHONE_ACCOUNTS intent. by Tyler Gunn · 7 years ago
  90. 7b23fff CDD: Require verified boot when device has enough RAM vs. by Christian Bejram · 7 years ago
  91. 73e5083 CDD: Require App Shortcuts when pinned shortcuts are supported by sachiyo · 7 years ago
  92. c094f94 Merge "CDD: Changes to measure biometric unlock security." into oc-mr1-dev am: 3a6ff29410 by Vikas Marwaha · 7 years ago
  93. 0f9dde6 Merge "CDD: Changes to measure biometric unlock security." into oc-mr1-dev by Vikas Marwaha · 7 years ago
  94. c16d30d Merge "CDD: Require double-tap play/pause to be mapped to next track." into oc-mr1-dev am: 50f7b18420 by Vikas Marwaha · 7 years ago
  95. 3a6ff29 Merge "CDD: Changes to measure biometric unlock security." into oc-mr1-dev by Vikas Marwaha · 7 years ago
  96. 6652967 Merge "CDD: Require double-tap play/pause to be mapped to next track." into oc-mr1-dev by Vikas Marwaha · 7 years ago
  97. 50f7b18 Merge "CDD: Require double-tap play/pause to be mapped to next track." into oc-mr1-dev by Vikas Marwaha · 7 years ago
  98. 813d563 Merge "CDD: AES encrypt the encryption key by default" into oc-mr1-dev am: 009ff2c391 by Vikas Marwaha · 7 years ago
  99. d48809f Merge "CDD: Allow relaxed display latency for VR devices." into oc-mr1-dev am: d4ac5e78ba -s ours by Vikas Marwaha · 7 years ago
  100. 4619481 Merge "CDD: Require that core app intents must be handled by preinstalled apps." into oc-mr1-dev am: ebf222ee0f -s ours by Vikas Marwaha · 7 years ago