1. 620f1c2 Merge "Merge "DO NOT MERGE: CTS test for Android Security b/34705519" into nyc-mr2-dev am: 72e2966423 -s ours am: 5406a4eb5b am: 5d048cad4c am: a79206cee8 -s ours" am: f1c4922c5c -s ours by Android Merger · 7 years ago
  2. a71c2c5 Manually merge commit '69de50b486' into oc-mr1-dev-plus-aosp by Stephen Li · 7 years ago
  3. a4ed547 DO NOT MERGE Remove CTS Test enforcing rotation limitations based on sdk level. by Bryce Lee · 7 years ago
  4. 2b500bf Merge "Merge "DO NOT MERGE: CTS test for Android Security b/34705519" into nyc-mr2-dev am: 72e2966423 -s ours am: 5406a4eb5b am: 5d048cad4c am: a79206cee8 -s ours" by Android Merger · 7 years ago
  5. df716d8 Merge "Avoid relying on the cut command since its behavior is branch dependent. am: 9887bd4e59 am: 3d2b07eb18 am: c0b76aad4f am: b08bc60000 am: dfcd400791 am: 1292ec8f4c am: 6228aac083 am: 354b71d922" am: 03c96dd041 by Android Merger · 7 years ago
  6. 69de50b Merge "Merge "Fix 'Global HTTP Proxy' . Do not creat Trusted CAcerts with 'Clear proxy' button. b/67835137" into oreo-cts-dev am: 437e48927c am: ad4bc98814 am: dbd362163f am: 161f8df68c" by Android Merger · 7 years ago
  7. 693aeb4 Merge "Merge changes If3a39737,Ica5d9bb0 into nyc-mr2-dev am: 35123e4b95 -s ours am: be71041fb3 am: f29064a41d am: bf750982cd" am: 96b799a336 by Android Merger · 7 years ago
  8. 898c2f8 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r16" into nougat-cts-dev am: 180de26729 -s ours am: 8efc7b82f8 am: 8cf58be498 -s ours am: ec975bc0bb am: a06b74d038 am: ce25ad45b9 -s ours am: 32993aa5f6 am: d53a4a8996 am: 36a54c1124 -s ours" by Android Merger · 7 years ago
  9. 6fd92cf Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r16" into nougat-cts-dev am: 180de26729 -s ours" into nougat-mr1-cts-dev am: fa37fd37a5 -s ours am: d9843d33c5 am: c32b24177e am: 43bb766ec8 -s ours am: cd460ada7e am: 6c4da8044e am: f8ce00f17d -s ours" by Android Merger · 7 years ago
  10. f18ef6e Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r16" into nougat-cts-dev am: 180de26729 -s ours" into nougat-mr1-cts-dev am: fa37fd37a5 -s ours" into oreo-cts-dev am: 493bf8ac24 -s ours am: 8608232f11 am: f119bf2b11 am: 7b4a1f123d -s ours" by Android Merger · 7 years ago
  11. 4a25fc9 Merge "Merge "STS test for Android Security b/34112914" into nyc-mr2-dev am: d96ef306d8 -s ours am: 76e42311df am: 38382a3a68 am: 5ae8e849ff" am: de1452645b by Android Merger · 7 years ago
  12. 2866c1f Merge "Avoid relying on the cut command since its behavior is branch dependent. am: 9887bd4e59 am: 3d2b07eb18 am: c0b76aad4f am: b08bc60000 am: dfcd400791 am: 1292ec8f4c am: 6228aac083 am: 354b71d922" by Android Merger · 7 years ago
  13. 09fdfd1 Merge "Merge changes If3a39737,Ica5d9bb0 into nyc-mr2-dev am: 35123e4b95 -s ours am: be71041fb3 am: f29064a41d am: bf750982cd" by Android Merger · 7 years ago
  14. 9c36b62 Merge "Merge "STS test for Android Security b/33863909" into nyc-mr2-dev am: 6962fba91a -s ours am: 65bdef3060 am: a5936debdd am: d8966278d3" am: baf8084d5f by Android Merger · 7 years ago
  15. 12920dc Merge "Merge "STS test for Android Security b/34112914" into nyc-mr2-dev am: d96ef306d8 -s ours am: 76e42311df am: 38382a3a68 am: 5ae8e849ff" by Android Merger · 7 years ago
  16. f0d1037 Merge "Merge "Add missing break statement" into oc-mr1-dev am: 3066d5acab" am: b1814b11d0 by Android Merger · 7 years ago
  17. e06039b Merge "Merge "STS test for Android Security b/33863909" into nyc-mr2-dev am: 6962fba91a -s ours am: 65bdef3060 am: a5936debdd am: d8966278d3" by Android Merger · 7 years ago
  18. bf287a4 Merge "Merge "STS test for Android Security b/33277611" into oc-dev am: 6de01152dc am: 16cc0762c3 am: 3f17639139" am: 4859d6463e by Android Merger · 7 years ago
  19. fc40ae8 Merge "Merge "cts: Add testAospSeappContexts to known failures." into oc-mr1-dev am: 69412b6ecf" am: f00939ee59 by Android Merger · 7 years ago
  20. 4704f8b Merge "Merge "Add missing break statement" into oc-mr1-dev am: 3066d5acab" by Android Merger · 7 years ago
  21. e3c34c6 Merge "Merge "Fix incorrect min memory requirement" into oc-mr1-dev am: 0f259c14b8" am: e2e91520a0 by Android Merger · 7 years ago
  22. 5547a8f Merge "Merge "STS test for Android Security b/33277611" into oc-dev am: 6de01152dc am: 16cc0762c3 am: 3f17639139" by Android Merger · 7 years ago
  23. ad844f4 Merge "Merge "Fix PointerCaptureTest#testEventDispatch" into oreo-cts-dev am: 12245f041c am: d54723ff59 am: 79d528e592 am: 2fc3c3c30e" am: cda7dc0b6d by Android Merger · 7 years ago
  24. 7b67e9d Merge "Merge "cts: Add testAospSeappContexts to known failures." into oc-mr1-dev am: 69412b6ecf" by Android Merger · 7 years ago
  25. 14fec42 Merge "Merge "add more execution time to embedded devices in media projection tests" into oc-mr1-dev am: a0b1f5f3ac" am: 3723716c7d by Android Merger · 7 years ago
  26. bbc7683 Merge "Merge "Fix incorrect min memory requirement" into oc-mr1-dev am: 0f259c14b8" by Android Merger · 7 years ago
  27. 8d9c6fc Merge "Merge "Add logging to PointerCaptureTest" into oreo-cts-dev am: b76acb5b7f am: 9775b7954e am: 566d2f891d am: e0a305a54c" am: 0c4f67b2ae by Android Merger · 7 years ago
  28. 9e3305c Merge "Merge "Fix PointerCaptureTest#testEventDispatch" into oreo-cts-dev am: 12245f041c am: d54723ff59 am: 79d528e592 am: 2fc3c3c30e" by Android Merger · 7 years ago
  29. 0110192 Merge "Merge "Remove usages of @hide APIs in PointerCaptureTest" into oreo-cts-dev am: 1eeb91761e am: d55a95c8d6 am: 73cbc3b4c9 am: 8ea9ede498" am: 64e0c2d6b7 by Android Merger · 7 years ago
  30. b4ae0c9 Merge "Merge "add more execution time to embedded devices in media projection tests" into oc-mr1-dev am: a0b1f5f3ac" by Android Merger · 7 years ago
  31. 9f058af Merge "Merge "Add logging to PointerCaptureTest" into oreo-cts-dev am: b76acb5b7f am: 9775b7954e am: 566d2f891d am: e0a305a54c" by Android Merger · 7 years ago
  32. a8272e0 Merge "Merge "Verify b/67737022 fix presence" into oc-dev am: 6ff1258356 am: b27e648d22 am: d33adbfad5" am: 75b0e5b9f1 by Android Merger · 7 years ago
  33. 74d038b Merge "Merge "DO NOT MERGE Remove CTS Test enforcing rotation limitations based on sdk level." into oc-mr1-dev am: cbce12a7fc -s ours" am: 6c4a1ffcba -s ours by Android Merger · 7 years ago
  34. 4c5bda3 Merge "Merge "Remove usages of @hide APIs in PointerCaptureTest" into oreo-cts-dev am: 1eeb91761e am: d55a95c8d6 am: 73cbc3b4c9 am: 8ea9ede498" by Android Merger · 7 years ago
  35. a348cce Merge "Merge changes Icfe73bf9,I5c8cc05b into nyc-mr1-dev am: 141c6518de am: 8c97f52b27 am: 0c5293a177 -s ours am: e878b791c7 am: 08d4a19533 am: 9f3f3d62f6" am: d3c3267cf8 by Android Merger · 7 years ago
  36. e542f71 Merge "Merge "Verify b/67737022 fix presence" into oc-dev am: 6ff1258356 am: b27e648d22 am: d33adbfad5" by Android Merger · 7 years ago
  37. 75118d8 Merge "Merge "CTS test for Android Security b/31824853" into nyc-mr1-dev am: 9e9c5ca3de am: 2f9506f462 am: 7d1de37355 -s ours am: fa9c1fd84a am: 924482ad89 am: 5eded5cc9b" am: 7d6da282f8 by Android Merger · 7 years ago
  38. a93defb Merge "Merge "DO NOT MERGE Remove CTS Test enforcing rotation limitations based on sdk level." into oc-mr1-dev am: cbce12a7fc -s ours" by Android Merger · 7 years ago
  39. 2bcb262 Merge "Merge changes Icfe73bf9,I5c8cc05b into nyc-mr1-dev am: 141c6518de am: 8c97f52b27 am: 0c5293a177 -s ours am: e878b791c7 am: 08d4a19533 am: 9f3f3d62f6" by Android Merger · 7 years ago
  40. dd43a2d Merge "Merge "Merge "Backport CTS hostside test features" into nyc-dev am: 66eea742bf am: acccf867d3 am: e330f45174 am: c95cd025ac am: a746f0e5bd" into oc-dev am: d2ce927766 am: 120b20a5b4 am: 5efbf01357" am: 0278a03a11 by Android Merger · 7 years ago
  41. fa46653 Merge "Merge "CTS test for Android Security b/31824853" into nyc-mr1-dev am: 9e9c5ca3de am: 2f9506f462 am: 7d1de37355 -s ours am: fa9c1fd84a am: 924482ad89 am: 5eded5cc9b" by Android Merger · 7 years ago
  42. e266c22 Merge "Merge "Test that createBitmap(65535,65535) throws OOME" into oc-dev am: cc001b2051 am: 742353a991 am: 767521fe37" am: 1db04b7e97 by Android Merger · 7 years ago
  43. e7edbfd Merge "Merge "Merge "Backport CTS hostside test features" into nyc-dev am: 66eea742bf am: acccf867d3 am: e330f45174 am: c95cd025ac am: a746f0e5bd" into oc-dev am: d2ce927766 am: 120b20a5b4 am: 5efbf01357" by Android Merger · 7 years ago
  44. af1b0a1 Merge "Add EffectBundleTest am: b6c68c1798 am: b9aa532ff2 am: ff674f480e am: 6eae457378 am: 6096dfb936 am: b9d119c236 am: 2330c813a0 am: a0aa5432cc am: 1300c30550 am: c0cf6328c0 am: 725ff0c773 am: e3d746db2d am: 61597922f8" am: 9384b7ca8a by Android Merger · 7 years ago
  45. a535354 Merge "Merge "Test that createBitmap(65535,65535) throws OOME" into oc-dev am: cc001b2051 am: 742353a991 am: 767521fe37" by Android Merger · 7 years ago
  46. ccb1451 Merge "Merge "STS test for Android Security b/32591350" into nyc-mr2-dev am: e2da3fa081 -s ours am: 9ef5911678 am: ffd809084b am: b8b3838b00" am: 8cd72fc457 by Android Merger · 7 years ago
  47. 1a27e46 Merge "Add EffectBundleTest am: b6c68c1798 am: b9aa532ff2 am: ff674f480e am: 6eae457378 am: 6096dfb936 am: b9d119c236 am: 2330c813a0 am: a0aa5432cc am: 1300c30550 am: c0cf6328c0 am: 725ff0c773 am: e3d746db2d am: 61597922f8" by Android Merger · 7 years ago
  48. addb263 Merge "Merge "CTS test for Android Security b/33899363" into oc-dev am: 3519495f70 am: 9017358eeb am: 1c1f21b876" am: 3c8a0ba26e by Android Merger · 7 years ago
  49. 38eb9f3 Merge "Merge "CTS test for Android Security b/33940449" into oc-dev am: 9fcaa3c943 am: 15bee1b60a am: 68e514d511" am: 716c549589 by Android Merger · 7 years ago
  50. 3d00667 Merge "Merge "STS test for Android Security b/32591350" into nyc-mr2-dev am: e2da3fa081 -s ours am: 9ef5911678 am: ffd809084b am: b8b3838b00" by Android Merger · 7 years ago
  51. 3450273 Merge "Merge changes Ibe01b9c9,I3834302b into nyc-mr2-dev am: e36e74044a am: f8bbf2b70a am: bfb876f08a am: e6236c0dbd" am: c39ed2d688 by Android Merger · 7 years ago
  52. 9a388f5 Merge "Merge "CTS test for Android Security b/33899363" into oc-dev am: 3519495f70 am: 9017358eeb am: 1c1f21b876" by Android Merger · 7 years ago
  53. 1bff092 Merge "Merge "STS test for Android Security b/34705430" into nyc-mr2-dev am: 771053a5c0 -s ours am: 7426257e47 am: aaf1e327f5 am: 3152e21c6e" am: 252247d4af by Android Merger · 7 years ago
  54. f984be7 Merge "Merge "CTS test for Android Security b/33940449" into oc-dev am: 9fcaa3c943 am: 15bee1b60a am: 68e514d511" by Android Merger · 7 years ago
  55. 50120b6 Merge "Merge changes If3a39737,Ica5d9bb0,I94365046,I98b09c29 into oc-dev am: 78fb327356 am: 76de70b84c am: 56db5a6455" am: a27d84edc4 by Android Merger · 7 years ago
  56. 04e3504 Merge "Merge changes Ibe01b9c9,I3834302b into nyc-mr2-dev am: e36e74044a am: f8bbf2b70a am: bfb876f08a am: e6236c0dbd" by Android Merger · 7 years ago
  57. 4c7d7bc Merge "Merge "CTS test for Android Security b/31824853" into oc-dev am: c81f767972 am: acea3ad113 am: ce2a0e8dcb" am: cbf280f25a by Android Merger · 7 years ago
  58. add305f Merge "Backport CTS hostside test features am: 715e3cd95c am: ded52c8852 -s ours am: 3dee435136 am: 3903b171ba am: c1b11e26e2 am: a3297a17d7" am: 6789586a1a by Android Merger · 7 years ago
  59. 84efc34 Merge "Merge "STS test for Android Security b/34705430" into nyc-mr2-dev am: 771053a5c0 -s ours am: 7426257e47 am: aaf1e327f5 am: 3152e21c6e" by Android Merger · 7 years ago
  60. e5b4178 Merge "Merge changes If3a39737,Ica5d9bb0,I94365046,I98b09c29 into oc-dev am: 78fb327356 am: 76de70b84c am: 56db5a6455" by Android Merger · 7 years ago
  61. 47633d0 Merge "Merge "Explicitly set done to false upon test run failure" into oreo-cts-dev am: dda6837af0 am: 627b743050 am: 8532e70492 am: cdf72253e9" am: 10f5ce7092 by Android Merger · 7 years ago
  62. 7b409f1 Merge "Merge "CameraITS: fix memory quota size" into oreo-cts-dev am: 55480b37c9 am: bb42e3a8a0 am: 4d9ab9630b am: 85b93c87e6" am: b7769c5014 by Android Merger · 7 years ago
  63. 8300275 Merge "Merge "CTS test for Android Security b/31824853" into oc-dev am: c81f767972 am: acea3ad113 am: ce2a0e8dcb" by Android Merger · 7 years ago
  64. 90dc7da Merge "Merge "DO NOT MERGE: Make the tests permissive for O" into oreo-cts-dev am: 2ffa3f4b2f -s ours am: 93fa08fd3e am: d6ae4f5eb7 am: 0106f2bfb0 -s ours" am: 2354e66e45 -s ours by Android Merger · 7 years ago
  65. 9a79fd2 Merge "Backport CTS hostside test features am: 715e3cd95c am: ded52c8852 -s ours am: 3dee435136 am: 3903b171ba am: c1b11e26e2 am: a3297a17d7" by Android Merger · 7 years ago
  66. 6dce0fd Merge "Merge "Explicitly set done to false upon test run failure" into oreo-cts-dev am: dda6837af0 am: 627b743050 am: 8532e70492 am: cdf72253e9" by Android Merger · 7 years ago
  67. 1e459da Merge "Merge "Fix regression on Ryu device" into oc-mr1-dev am: 57198dd2ac" am: 8e05a6a8b7 by Android Merger · 7 years ago
  68. 73af2b8 Merge "Merge "Add vts to test for Android Security b/34705430 to avoid breaking CTS-on-GSI which is used to approve oc-mr1 devices b/68225311" into oc-dev am: 03a32d3380 am: 8f8fa7deac am: 3acf62e0f4" am: a20de157f7 by Android Merger · 7 years ago
  69. c053264 Merge "Merge "CameraITS: fix memory quota size" into oreo-cts-dev am: 55480b37c9 am: bb42e3a8a0 am: 4d9ab9630b am: 85b93c87e6" by Android Merger · 7 years ago
  70. b167aa5 Merge "Merge "Add vts to test for Android Security b/32591350 to avoid breaking CTS-on-GSI which is used to approve oc-mr1 devices b/68161750" into oc-dev am: a7fbf5f732 am: 22e9db9653 am: 5e4c657db2" am: b89fb70c4d by Android Merger · 7 years ago
  71. 3ee464f Merge "Merge "DO NOT MERGE: Make the tests permissive for O" into oreo-cts-dev am: 2ffa3f4b2f -s ours am: 93fa08fd3e am: d6ae4f5eb7 am: 0106f2bfb0 -s ours" by Android Merger · 7 years ago
  72. 6c6c334 Merge "Merge "Fix regression on Ryu device" into oc-mr1-dev am: 57198dd2ac" by Android Merger · 7 years ago
  73. 695f2b1 Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: ad65696800 am: 9e3b7e2589 am: 8b79dd6e40 am: 4417b568aa" am: 51884f173c by Android Merger · 7 years ago
  74. 418fb54 Merge "Merge "Add vts to test for Android Security b/34705430 to avoid breaking CTS-on-GSI which is used to approve oc-mr1 devices b/68225311" into oc-dev am: 03a32d3380 am: 8f8fa7deac am: 3acf62e0f4" by Android Merger · 7 years ago
  75. e6d6204 Merge "Add vts to test for Android Security b/32591350 am: f662039257" am: 6e32a23948 by Android Merger · 7 years ago
  76. 6aa4689 Merge "Merge "CtsOpenGlPerfTestCases: Skip mix max FPS comparison for software OpenGL" into oc-mr1-dev am: a515da0cc3" am: 34eeb404f6 by Android Merger · 7 years ago
  77. ffcfdbd Merge "Merge "Add vts to test for Android Security b/32591350 to avoid breaking CTS-on-GSI which is used to approve oc-mr1 devices b/68161750" into oc-dev am: a7fbf5f732 am: 22e9db9653 am: 5e4c657db2" by Android Merger · 7 years ago
  78. 9edb6f3 Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: ad65696800 am: 9e3b7e2589 am: 8b79dd6e40 am: 4417b568aa" by Android Merger · 7 years ago
  79. 4fec818 Merge "Merge "STS test for Android Security b/34705430" into oc-dev am: 5d1f484456 am: 53769858f9 am: cdbfc92105" am: b0b00d2c6a by Android Merger · 7 years ago
  80. b2c0643 Merge "Merge "STS test for Android Security b/32591350" into oc-dev am: d7852a0de1 am: bb30d7a9b3 am: da010b786d" am: 3f221c2360 by Android Merger · 7 years ago
  81. c424497 Merge "Add vts to test for Android Security b/32591350 am: f662039257" by Android Merger · 7 years ago
  82. a4b7454 Merge "SELinuxHostTests: Enforce from shipping api 27 onwards. am: 8e5b5a7241" am: 1480e227dc by Android Merger · 7 years ago
  83. b0130cf Merge "Merge "CtsOpenGlPerfTestCases: Skip mix max FPS comparison for software OpenGL" into oc-mr1-dev am: a515da0cc3" by Android Merger · 7 years ago
  84. c0b60df Merge "Merge "CtsViewTestCases: increase timeout" into oc-mr1-dev am: a33979015a" am: df35303005 by Android Merger · 7 years ago
  85. 0d9a73b Merge "Merge "STS test for Android Security b/34705430" into oc-dev am: 5d1f484456 am: 53769858f9 am: cdbfc92105" by Android Merger · 7 years ago
  86. fc15f54 Merge "Merge "CtsViewTestCases: fix flakiness in DragDropTest" into oc-mr1-dev am: 720941d794" am: 90828a08d4 by Android Merger · 7 years ago
  87. a234711 Merge "Merge "STS test for Android Security b/32591350" into oc-dev am: d7852a0de1 am: bb30d7a9b3 am: da010b786d" by Android Merger · 7 years ago
  88. 6555101 Merge "Merge "Fix for b/68051472" into nyc-dev am: 7d4643347f am: 1fe4b4022c am: 89d9036a9d am: 2d7a3dca17 am: 4188de9079 am: 8e308b2fe0 am: f7f107f8c6 am: 0fbe826968" am: 85602f42f9 by Android Merger · 7 years ago
  89. ca4874d Merge "Merge "DO NOT MERGE CtsServicesHostTestCases: skip tests when the required feature is not enabled" into oc-mr1-dev am: 4ca76617fa -s ours" am: cdcc226b73 -s ours by Android Merger · 7 years ago
  90. b361c90 Merge "SELinuxHostTests: Enforce from shipping api 27 onwards. am: 8e5b5a7241" by Android Merger · 7 years ago
  91. dc384bb Merge "Merge "CtsViewTestCases: increase timeout" into oc-mr1-dev am: a33979015a" by Android Merger · 7 years ago
  92. 6bd0248 Merge "Merge "CtxPreference2TestCases: assert appearances of UI items before capturing a screen" into oc-mr1-dev am: f4fe25db57" am: e1bfce25e8 by Android Merger · 7 years ago
  93. 07f18ec Merge "Merge "CtsViewTestCases: fix flakiness in DragDropTest" into oc-mr1-dev am: 720941d794" by Android Merger · 7 years ago
  94. 33bd201 Merge "Merge "Fix build" into mnc-dev am: af1e462b57 am: 54e3654d2d am: 1627c7272f am: 809ce83ef9 am: d4b0ab7481 am: 57fcac5b40 am: 31f0655eb4 am: 582dd4db23 am: 65b6b2531b am: 0d5217c98b am: 28429ebf18 am: 10b5d0d22f" am: 5ed7f25bde by Android Merger · 7 years ago
  95. 68aa3877 Merge "Merge "Fix for b/68051472" into nyc-dev am: 7d4643347f am: 1fe4b4022c am: 89d9036a9d am: 2d7a3dca17 am: 4188de9079 am: 8e308b2fe0 am: f7f107f8c6 am: 0fbe826968" by Android Merger · 7 years ago
  96. 7c983d6 Merge "Merge "Add CTS test for cve_2017_0852_b_62815506" into lmp-dev am: 47d0b5f91e am: 23e81fe839 -s ours am: 07912b8549 -s ours am: 5c7d800082 -s ours am: 0079086bab -s ours am: b0851ef309 -s ours am: 6ef8e9ffda -s ours am: 6df952d985 -s ours am: 072abe15f8 -s ours am: 3e0148275c -s ours am: 6544ea648b -s ours am: 33e3a08f39 -s ours am: 1b4ebadeb4 -s ours am: d3609046d6 -s ours" am: b55f0d7545 -s ours by Android Merger · 7 years ago
  97. c00b20b Merge "Merge "DO NOT MERGE CtsServicesHostTestCases: skip tests when the required feature is not enabled" into oc-mr1-dev am: 4ca76617fa -s ours" by Android Merger · 7 years ago
  98. 5def46c Merge "Merge "CtxPreference2TestCases: assert appearances of UI items before capturing a screen" into oc-mr1-dev am: f4fe25db57" by Android Merger · 7 years ago
  99. 290756a Merge "Merge "Catch exception from MediaExtractor.selectTrack" into lmp-dev am: c67ccf397a am: d98ab4cd39 -s ours am: 5de77f2443 am: dd307689d5 am: bd4218ffc6 am: 72545740c5 am: 39c3882c86 am: 929f30de26 am: b71ae4e87c am: 62735fed4d am: 3067c1c074 am: 204898a19d am: da9ecba1e9 am: 863ec1c83f" am: ca25db455d by Android Merger · 7 years ago
  100. 4f8d808 Merge "Merge "CtsGraphicsTestCases: increase timeout in CameraGpuTest" into oc-mr1-dev am: cb4ba1e059" am: 8d7544afe3 by Android Merger · 7 years ago