Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / cts / ab3d3b68cd317e155b9b35a31cabcc4eecc9f2e1
  1. ab3d3b6 Merge "Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev am: 3573dc7108 am: e35ddc1b27" into oc-dr1-dev-plus-aosp by Sudheer Shanka · 7 years ago
  2. 17d1af4 Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev am: 3573dc7108 am: f42ab2adc8 by Sudheer Shanka · 7 years ago
  3. 1d25613 Merge "Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev am: 3573dc7108 am: e35ddc1b27" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  4. 648a66f Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev am: 3573dc7108 by Sudheer Shanka · 7 years ago
  5. 26b96f8 Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev am: 3573dc7108 by Sudheer Shanka · 7 years ago
  6. e35ddc1 Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev by Sudheer Shanka · 7 years ago
  7. f42ab2a Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev by Sudheer Shanka · 7 years ago
  8. 3573dc7 Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev by Sudheer Shanka · 7 years ago
  9. c1c6be5 Merge "Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2232be29eb am: fa6b454cf9" into oc-dr1-dev-plus-aosp by Dianne Hackborn · 7 years ago
  10. 156230f Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2232be29eb am: de6f3edb49 by Dianne Hackborn · 7 years ago
  11. bc76f1e Merge "Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2232be29eb am: fa6b454cf9" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  12. d459f0a Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2232be29eb by Dianne Hackborn · 7 years ago
  13. 5711e4d Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2232be29eb by Dianne Hackborn · 7 years ago
  14. fa6b454 Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev by Dianne Hackborn · 7 years ago
  15. de6f3ed Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev by Dianne Hackborn · 7 years ago
  16. 2232be2 Merge "Test for issue #62524613: Background limitation is not working as expected..." into oc-dev by TreeHugger Robot · 7 years ago
  17. 2050fbb Merge "Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 am: 25de618dd0" into oc-dr1-dev-plus-aosp by Sudheer Shanka · 7 years ago
  18. 5e4a839 Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 am: 64944e2069 by Sudheer Shanka · 7 years ago
  19. 011f674 Merge "Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 am: 25de618dd0" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  20. 15ac661 Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 by Sudheer Shanka · 7 years ago
  21. 6d481a3 Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 by Sudheer Shanka · 7 years ago
  22. 64944e2 Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 by Sudheer Shanka · 7 years ago
  23. 25de618 Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 by Sudheer Shanka · 7 years ago
  24. fff08f9 Merge "Catch Throwable instead of Exception." into oc-dev by TreeHugger Robot · 7 years ago
  25. 0d21acc Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 am: f7e6796b4c am: 8327e4bb0c am: ba707e6726 am: cd0c81a1e5 by Ruchi Kandoi · 7 years ago
  26. b5b49d0 Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 am: f7e6796b4c am: 8327e4bb0c am: ba707e6726 am: db38b71a94 by Ruchi Kandoi · 7 years ago
  27. b24f6bc Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 am: f7e6796b4c am: 8327e4bb0c am: ba707e6726 by Ruchi Kandoi · 7 years ago
  28. 620f9b2 Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 am: f7e6796b4c am: 8327e4bb0c am: ba707e6726 by Ruchi Kandoi · 7 years ago
  29. cd0c81a Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 am: f7e6796b4c am: 8327e4bb0c by Ruchi Kandoi · 7 years ago
  30. db38b71 Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 am: f7e6796b4c am: 8327e4bb0c by Ruchi Kandoi · 7 years ago
  31. 71ce137 Merge "Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe" am: 90e30f83fb am: 3a1b033db1 am: a36f40ba8a by Ruchi Kandoi · 7 years ago
  32. ba707e6 Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 am: f7e6796b4c by Ruchi Kandoi · 7 years ago
  33. 5123e6d Merge "Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe" am: 90e30f83fb am: 3a1b033db1 by Ruchi Kandoi · 7 years ago
  34. a36f40b Merge "Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe" am: 90e30f83fb by Ruchi Kandoi · 7 years ago
  35. 8327e4b Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe am: 958b98a9f1 by Ruchi Kandoi · 7 years ago
  36. 3a1b033 Merge "Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe" by Ruchi Kandoi · 7 years ago
  37. f7e6796 Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe by Ruchi Kandoi · 7 years ago
  38. 958b98a Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe by Ruchi Kandoi · 7 years ago
  39. 90e30f8 Merge "Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe" by Android Merger · 7 years ago
  40. cbaf49d Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev am: 2219875ebe by Ruchi Kandoi · 7 years ago
  41. 2219875 Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev by Treehugger Robot · 7 years ago
  42. 16a4974 Merge "Add test that decoding a corrupt ICO does not OOM" by TreeHugger Robot · 7 years ago
  43. af104a3 Test for issue #62524613: Background limitation is not working as expected... by Dianne Hackborn · 7 years ago
  44. 6ceb29c Merge "Don't run fingerprint tests on devices that don't have fingerprint readers. am: 6ef7ab7b66 am: 722257e21c" into oc-dr1-dev-plus-aosp by Joe Onorato · 7 years ago
  45. 550cc50 Don't run fingerprint tests on devices that don't have fingerprint readers. am: 6ef7ab7b66 am: c91a94dff9 by Joe Onorato · 7 years ago
  46. c6ce3dd Merge "Add skeleton SyncTest for NDK libsync" by Jesse Hall · 7 years ago
  47. 6a47eb9 Merge "Don't run fingerprint tests on devices that don't have fingerprint readers. am: 6ef7ab7b66 am: 722257e21c" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  48. 6c748c6 Don't run fingerprint tests on devices that don't have fingerprint readers. am: 6ef7ab7b66 by Joe Onorato · 7 years ago
  49. c791523 Don't run fingerprint tests on devices that don't have fingerprint readers. am: 6ef7ab7b66 by Joe Onorato · 7 years ago
  50. c91a94d Don't run fingerprint tests on devices that don't have fingerprint readers. by Joe Onorato · 7 years ago
  51. 722257e Don't run fingerprint tests on devices that don't have fingerprint readers. by Joe Onorato · 7 years ago
  52. 1cdb3a0 Nfc Verifier: Edit error message by Ruchi Kandoi · 7 years ago
  53. af4c655 Catch Throwable instead of Exception. by Sudheer Shanka · 7 years ago
  54. 6ef7ab7 Don't run fingerprint tests on devices that don't have fingerprint readers. by Joe Onorato · 7 years ago
  55. 30d296a Add test that decoding a corrupt ICO does not OOM by Leon Scroggins III · 7 years ago
  56. c67ae81 Merge "Change Linkify phone tests to rely on SIM card region" by Roozbeh Pournader · 7 years ago
  57. 086770b Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883 am: 9d346c70d2 by Julien Desprez · 7 years ago
  58. 02d708a Fix dependencies of packages that target earlier releases am: 33d7d2d2f0 -s ours by Paul Duffin · 7 years ago
  59. a6ea2a1 Merge "Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883 am: 59608a4ab1" into oc-dr1-dev-plus-aosp by Julien Desprez · 7 years ago
  60. 7bb74c6 Fix dependencies of packages that target earlier releases by Paul Duffin · 7 years ago
  61. 81fa3a1 Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883 by Julien Desprez · 7 years ago
  62. 2da2a6f Fix dependencies of packages that target earlier releases by Paul Duffin · 7 years ago
  63. 32d2218 Merge "Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883 am: 59608a4ab1" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  64. ad35e37 Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883 by Julien Desprez · 7 years ago
  65. 9d346c7 Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883 by Julien Desprez · 7 years ago
  66. 59608a4 Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883 by Julien Desprez · 7 years ago
  67. 8234552 Fix dependencies of packages that target earlier releases by Paul Duffin · 7 years ago
  68. 75c104f Merge "Copy the retry split from master to oc-dev" into oc-dev by Julien Desprez · 7 years ago
  69. 6f3269e Merge "Fix dependencies of packages that target earlier releases" by Paul Duffin · 7 years ago
  70. 33d7d2d Fix dependencies of packages that target earlier releases by Paul Duffin · 7 years ago
  71. 669d836 Merge "Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c am: 336f5f028b am: 13160f0ab1" into oc-dr1-dev-plus-aosp by Craig Donner · 7 years ago
  72. f3ed555 Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c am: 336f5f028b am: 0f8541ef6d by Craig Donner · 7 years ago
  73. ef5da65 Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours am: 81e5cd37ba am: e86071b524" into oc-dr1-dev-plus-aosp by Tina Zhou · 7 years ago
  74. 94e11d8 Merge "Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c am: 336f5f028b am: 13160f0ab1" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  75. cb93b4c Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours am: 81e5cd37ba am: ee977641c1 by Tina Zhou · 7 years ago
  76. 47ca8f5 Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c am: 336f5f028b by Craig Donner · 7 years ago
  77. 25d6636 Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c am: 336f5f028b by Craig Donner · 7 years ago
  78. 72ffa0a Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours am: 81e5cd37ba am: e86071b524" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  79. 5c59228 Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours am: 81e5cd37ba by Tina Zhou · 7 years ago
  80. 0f8541e Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c by Craig Donner · 7 years ago
  81. 13160f0 Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c by Craig Donner · 7 years ago
  82. 07c2623 Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours am: 81e5cd37ba by Tina Zhou · 7 years ago
  83. c022c4b Merge "Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7" am: f770e25353 am: 7db3d38cc7 am: a10f584d95 by Craig Donner · 7 years ago
  84. ee97764 Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours by Tina Zhou · 7 years ago
  85. 336f5f0 Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 by Craig Donner · 7 years ago
  86. e86071b Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 am: a5468ae54e -s ours by Tina Zhou · 7 years ago
  87. 60622b4 Merge "Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7" am: f770e25353 am: 7db3d38cc7 by Craig Donner · 7 years ago
  88. 81e5cd3 Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 am: afb80b9097 by Tina Zhou · 7 years ago
  89. 46affcd Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 by Craig Donner · 7 years ago
  90. a10f584 Merge "Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7" am: f770e25353 by Craig Donner · 7 years ago
  91. 665d889 Merge "Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours" into nougat-cts-dev am: 2846f85009 -s ours am: 98c75d0dc2 am: 8b6d7007c7 am: 816d134e4e am: 41d96a5c2b am: 3bcef9165e -s ours am: 5a68b62174 am: d50db10a37" into oc-dr1-dev-plus-aosp by Tina Zhou · 7 years ago
  92. a5468ae Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 am: 91f1fa4331 by Tina Zhou · 7 years ago
  93. 848112b Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours" into nougat-cts-dev am: 2846f85009 -s ours am: 98c75d0dc2 am: 8b6d7007c7 am: 816d134e4e am: 41d96a5c2b am: 3bcef9165e -s ours am: 5a68b62174 am: 9288e0fb81 by Tina Zhou · 7 years ago
  94. a463b74 Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 by Craig Donner · 7 years ago
  95. 7db3d38 Merge "Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7" by Craig Donner · 7 years ago
  96. 523d789 Merge "Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours" into nougat-cts-dev am: 2846f85009 -s ours am: 98c75d0dc2 am: 8b6d7007c7 am: 816d134e4e am: 41d96a5c2b am: 3bcef9165e -s ours am: 5a68b62174 am: d50db10a37" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  97. afb80b9 Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours am: d04aa5ef35 am: e67c0bde0f am: 092de7e668 am: 722377487d -s ours am: 92e50a4a35 am: 60ed3a6cb8 by Tina Zhou · 7 years ago
  98. a70dcaf Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours" into nougat-cts-dev am: 2846f85009 -s ours am: 98c75d0dc2 am: 8b6d7007c7 am: 816d134e4e am: 41d96a5c2b am: 3bcef9165e -s ours am: 5a68b62174 by Tina Zhou · 7 years ago
  99. c46b977 Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours" into nougat-cts-dev am: 2846f85009 -s ours am: 98c75d0dc2 am: 8b6d7007c7 am: 816d134e4e am: 41d96a5c2b am: 3bcef9165e -s ours am: 5a68b62174 by Tina Zhou · 7 years ago
  100. 32ea96b Merge "Merge "Merge "Merge "Merge "Revert "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets"" into lollipop-mr1-cts-dev am: ba4c8a9553 -s ours" into marshmallow-cts-dev am: fecfbf9fda -s ours" into nougat-cts-dev am: 2846f85009 -s ours" into nougat-mr1-cts-dev am: 4c04b87d17 -s ours am: e4ff9c2edd am: c1b8dd23e6 am: ee4f4ff071 -s ours am: b549d03361 am: 6ce758683a" into oc-dr1-dev-plus-aosp by Tina Zhou · 7 years ago