Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / cts / 3db5bdc293eb41aae2d194cff051f5714c1da2e4
  1. 3db5bdc Merge "DO NOT MERGE" into nougat-mr1-cts-dev am: 01d748c290 -s ours am: 15a4870295 by Tina Zhou · 7 years ago
  2. 14d9211 Merge "DO NOT MERGE" into nougat-mr1-cts-dev am: 01d748c290 -s ours by Tina Zhou · 7 years ago
  3. 15a4870 Merge "DO NOT MERGE" into nougat-mr1-cts-dev am: 01d748c290 -s ours by Tina Zhou · 7 years ago
  4. 01d748c Merge "DO NOT MERGE" into nougat-mr1-cts-dev by Tina Zhou · 7 years ago
  5. c90371a Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38 am: 82f0acfa5f am: 99405f9f45 am: 2a758ad22b by Takeshi Katae · 7 years ago
  6. 3fcf2d4 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours am: e495986d8c am: b7d7f41dcb am: 8f652ffd03 by tinazh · 7 years ago
  7. 3403a1e Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours am: 41448566af am: 4c8b231a71 am: 489e28f44b by tinazh · 7 years ago
  8. 18449e5 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 298bd4e1a9 am: 35f297345d am: be9ef9e513 by Chenbo Feng · 7 years ago
  9. 189b0ad Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38 am: 82f0acfa5f am: 99405f9f45 by Takeshi Katae · 7 years ago
  10. c0f4a21 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours am: e495986d8c am: b7d7f41dcb by tinazh · 7 years ago
  11. 0b8c810 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours am: 41448566af am: 4c8b231a71 by tinazh · 7 years ago
  12. 37b1ada Merge "Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38" into nougat-mr1-cts-dev am: 8a330a1a38 am: cfff6a6e4c by Takeshi Katae · 7 years ago
  13. bb7c11a Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours" into nougat-mr1-cts-dev am: 2dfc77ddf4 -s ours am: ab1326bf9c by tinazh · 7 years ago
  14. 2a758ad Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38 am: 82f0acfa5f by Takeshi Katae · 7 years ago
  15. 693fba4 Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours" into nougat-mr1-cts-dev am: 1b6b83cdf4 -s ours am: 435e46d7b9 by tinazh · 7 years ago
  16. 8f652ff Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours am: e495986d8c by tinazh · 7 years ago
  17. 489e28f Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours am: 41448566af by tinazh · 7 years ago
  18. 921e4b7 Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 3840425b14 am: a845e640b1 by Chenbo Feng · 7 years ago
  19. deb0508 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 298bd4e1a9 am: 35f297345d by Chenbo Feng · 7 years ago
  20. be9ef9e Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 298bd4e1a9 by Chenbo Feng · 7 years ago
  21. ad9c95d Merge "Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38" into nougat-mr1-cts-dev am: 8a330a1a38 by Takeshi Katae · 7 years ago
  22. 99405f9 Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38 by Takeshi Katae · 7 years ago
  23. 1e7a92c Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours" into nougat-mr1-cts-dev am: 2dfc77ddf4 -s ours by tinazh · 7 years ago
  24. b7d7f41 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours by tinazh · 7 years ago
  25. 0348d66 Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours" into nougat-mr1-cts-dev am: 1b6b83cdf4 -s ours by tinazh · 7 years ago
  26. 4c8b231 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours by tinazh · 7 years ago
  27. 13827a3 Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 3840425b14 by Chenbo Feng · 7 years ago
  28. 35f2973 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e by Chenbo Feng · 7 years ago
  29. cfff6a6 Merge "Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38" into nougat-mr1-cts-dev by Takeshi Katae · 7 years ago
  30. ab1326b Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours" into nougat-mr1-cts-dev by tinazh · 7 years ago
  31. 435e46d Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours" into nougat-mr1-cts-dev by tinazh · 7 years ago
  32. 82f0acf Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev by Takeshi Katae · 7 years ago
  33. a845e64 Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev by Chenbo Feng · 7 years ago
  34. e495986 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev by tinazh · 7 years ago
  35. 4144856 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev by tinazh · 7 years ago
  36. 298bd4e Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev by Chenbo Feng · 7 years ago
  37. 8a330a1 Merge "Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38" into nougat-mr1-cts-dev by Android Merger · 7 years ago
  38. 36069be Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev by Takeshi Katae · 7 years ago
  39. 2dfc77d Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours" into nougat-mr1-cts-dev by Android Merger · 7 years ago
  40. 833ead2 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev by tinazh · 7 years ago
  41. 1b6b83c Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev am: 09ad291b6f -s ours" into nougat-mr1-cts-dev by Android Merger · 7 years ago
  42. d54e51d Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev by tinazh · 7 years ago
  43. fd86d39 Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev by Android Merger · 7 years ago
  44. 5f7079b Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev by Takeshi Katae · 7 years ago
  45. 9c7e358 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev by Android Merger · 7 years ago
  46. a16bdbe Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev by tinazh · 7 years ago
  47. 09ad291 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev am: 32a08d8c90 -s ours" into nougat-cts-dev by Android Merger · 7 years ago
  48. 3840425 Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev by Android Merger · 7 years ago
  49. d45c7c7 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf -s ours" into marshmallow-cts-dev by tinazh · 7 years ago
  50. 918d248 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev by Chenbo Feng · 7 years ago
  51. e37efbd Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev by Treehugger Robot · 7 years ago
  52. 4663406 Resolve merge conflicts of 8482d8c85c to nougat-cts-dev by Chenbo Feng · 7 years ago
  53. 329ee93 Merge "DO NOT MERGE" into nougat-mr1-cts-dev am: eeee5819d4 -s ours am: ca4b2c9b49 by Kenny Root · 7 years ago
  54. bf64065 Merge "DO NOT MERGE" into nougat-mr1-cts-dev am: eeee5819d4 -s ours by Kenny Root · 7 years ago
  55. ca4b2c9 Merge "DO NOT MERGE" into nougat-mr1-cts-dev am: eeee5819d4 -s ours by Kenny Root · 7 years ago
  56. eeee581 Merge "DO NOT MERGE" into nougat-mr1-cts-dev by Treehugger Robot · 7 years ago
  57. 8441721 Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e am: dc327bb5d6 am: 4048f93928 am: 698bda6595 by Bryan Cassell · 7 years ago
  58. cee9c92 Merge "Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e" into nougat-mr1-cts-dev am: d94352b454 am: 09723249c9 by Bryan Cassell · 7 years ago
  59. a6c759b Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e am: dc327bb5d6 am: 4048f93928 by Bryan Cassell · 7 years ago
  60. 5add8fc Merge "Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e" into nougat-mr1-cts-dev am: d94352b454 by Bryan Cassell · 7 years ago
  61. 698bda6 Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e am: dc327bb5d6 by Bryan Cassell · 7 years ago
  62. 0972324 Merge "Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e" into nougat-mr1-cts-dev by Bryan Cassell · 7 years ago
  63. 4048f93 Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e by Bryan Cassell · 7 years ago
  64. d94352b Merge "Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e" into nougat-mr1-cts-dev by Android Merger · 7 years ago
  65. 7d9bf90 Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev by Bryan Cassell · 7 years ago
  66. dc327bb Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev by Bryan Cassell · 7 years ago
  67. 4c1b10f Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev by Treehugger Robot · 7 years ago
  68. 5483fb6 Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev by Android Merger · 7 years ago
  69. 8380d33 Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev by Takeshi Katae · 7 years ago
  70. 4d615c9 Merge "Adding tvdpi assets" into nougat-mr1-cts-dev am: 64a884f1f8 am: de63fabdf7 by Raj Mamadgi · 7 years ago
  71. 4cc9094 Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c am: bf5b2382a3 am: a644467802 am: 43365f56e7 by Edwin Wong · 7 years ago
  72. 28c4fda Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours am: 73ca853a63 am: 5122dd98f1 -s ours am: de4f7cfa2e by tinazh · 7 years ago
  73. 4473877 Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev by Treehugger Robot · 7 years ago
  74. 447be1c Merge "Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c" into nougat-mr1-cts-dev am: c556b8adeb am: 87565ff346 by Edwin Wong · 7 years ago
  75. 1d05754 Merge "Adding tvdpi assets" into nougat-mr1-cts-dev am: 64a884f1f8 by Raj Mamadgi · 7 years ago
  76. de63fab Merge "Adding tvdpi assets" into nougat-mr1-cts-dev am: 64a884f1f8 by Raj Mamadgi · 7 years ago
  77. 64a884f Merge "Adding tvdpi assets" into nougat-mr1-cts-dev by Treehugger Robot · 7 years ago
  78. 2522de6 Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c am: bf5b2382a3 am: a644467802 by Edwin Wong · 7 years ago
  79. 85c34d3 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours am: 73ca853a63 am: 5122dd98f1 -s ours by tinazh · 7 years ago
  80. 3b41d6b Merge "Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c" into nougat-mr1-cts-dev am: c556b8adeb by Edwin Wong · 7 years ago
  81. 43365f5 Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c am: bf5b2382a3 by Edwin Wong · 7 years ago
  82. a644467 Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c by Edwin Wong · 7 years ago
  83. de4f7cf Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours am: 73ca853a63 by tinazh · 7 years ago
  84. 87565ff Merge "Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c" into nougat-mr1-cts-dev by Edwin Wong · 7 years ago
  85. bf5b238 Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c by Edwin Wong · 7 years ago
  86. 99667ac Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r8" into nougat-mr1-cts-dev am: 3f5706401b -s ours am: fe60b10ca3 by tinazh · 7 years ago
  87. c556b8a Merge "Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c" into nougat-mr1-cts-dev by Android Merger · 7 years ago
  88. a47c5fb Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c by Edwin Wong · 7 years ago
  89. b13c3af Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r8" into nougat-mr1-cts-dev am: 3f5706401b -s ours by tinazh · 7 years ago
  90. f96407b Merge "Add NativeClearKeySystemTest." into nougat-cts-dev by Treehugger Robot · 7 years ago
  91. fe60b10 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r8" into nougat-mr1-cts-dev by tinazh · 7 years ago
  92. 3f57064 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r8" into nougat-mr1-cts-dev by Treehugger Robot · 7 years ago
  93. 3ad6d3b DO NOT MERGE by Kenny Root · 8 years ago
  94. 8086cec Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours" into nougat-mr1-cts-dev am: 7b1e4ae819 -s ours am: c8c6d20470 by tinazh · 7 years ago
  95. f6007f2 DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r8 by tinazh · 7 years ago
  96. dfc8e0d Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours" into nougat-mr1-cts-dev am: 7b1e4ae819 -s ours by tinazh · 7 years ago
  97. c8c6d20 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours" into nougat-mr1-cts-dev by tinazh · 7 years ago
  98. 5122dd9 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours by tinazh · 7 years ago
  99. 73ca853 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev by tinazh · 7 years ago
  100. 7b1e4ae Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01 -s ours" into nougat-mr1-cts-dev by Android Merger · 7 years ago