1. eb62505 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 am: a1d21ae719 am: 56c85d031b am: bad9e6b71e am: addb109095 by Daniel Xie · 10 years ago
  2. 6cb1982 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 am: adade48b09 am: d8ee6a8021 am: 74e113baa8 by Daniel Xie · 10 years ago
  3. 90c92c8 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 am: 0b7028aca6 am: 66e2af7309 am: aa0a75665f by Daniel Xie · 10 years ago
  4. 1fa6039 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 am: 2dea78fe49 am: 42ba33109c am: 1517dc91c6 by Daniel Xie · 10 years ago
  5. 44a4766 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 am: 880fb0f02d am: 08a824f44d am: 61858606b0 by Daniel Xie · 10 years ago
  6. 0fc907a Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf am: 7d5dab187d am: 170f523ebb am: 02bbad03ea am: 35c51ca321 by Daniel Xie · 10 years ago
  7. 8c76a05 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 am: 22fc1c9d7a am: 111f8b0c9f am: d25ae05764 by Daniel Xie · 10 years ago
  8. 1ffda1f Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 98fb65c213 am: 721971a749 am: 26e27bcbab by Daniel Xie · 10 years ago
  9. 8b0fa1d Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f am: e21cd83b3f am: 76bf66b0d2 am: 6611fc857f by Daniel Xie · 10 years ago
  10. 131aa65 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 am: a7eb20734c am: ee5c9c1104 am: ac6b80f47c am: 6f4dc618ac by Daniel Xie · 10 years ago
  11. 62a4d22 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: f2fb49577d am: 536bb1b83e am: 09b71072c2 by Daniel Xie · 10 years ago
  12. 752a831 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 am: a1d21ae719 am: 56c85d031b am: bad9e6b71e by Daniel Xie · 10 years ago
  13. 3bf42a0 Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d am: 5287f75394 am: 898b83e8a3 am: 4efb96f249 am: bc1ac6b844 by Daniel Xie · 10 years ago
  14. af70bc3 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 am: adade48b09 am: d8ee6a8021 by Daniel Xie · 10 years ago
  15. dac2bdb Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee am: e59e98fba4 am: 934091ba0f am: 0336ccd432 am: c7b67a7308 by Daniel Xie · 10 years ago
  16. 6a2af61 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 am: 0b7028aca6 am: 66e2af7309 by Daniel Xie · 10 years ago
  17. 43dd148 Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours am: f51347ea43 am: eea143b960 am: c252123ed4 am: 78503b6af7 am: a3c010b8c3 by Daniel Xie · 10 years ago
  18. 94bd6d4 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 am: 2dea78fe49 am: 42ba33109c by Daniel Xie · 10 years ago
  19. 39f95c6 Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev am: 017be55776 am: 62c9d0fdea by Daniel Xie · 10 years ago
  20. 7162126 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 am: 880fb0f02d am: 08a824f44d by Daniel Xie · 10 years ago
  21. e88e63e Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 8a95fe92c3 am: 36d3b99c4e am: 224b2202c3 by Daniel Xie · 10 years ago
  22. 1f2b7b9 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf am: 7d5dab187d am: 170f523ebb am: 02bbad03ea by Daniel Xie · 10 years ago
  23. f5dd118 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 am: 423b1a77b9 am: b0538a4994 am: e7a3136b90 by Daniel Xie · 10 years ago
  24. 39498fb Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 am: 22fc1c9d7a am: 111f8b0c9f by Daniel Xie · 10 years ago
  25. bcadfd1 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 am: 84b3ea0675 am: 9b67b1cd95 am: bcf2a7c22a am: 4cb0e4faa8 am: 73944a50ba by Daniel Xie · 10 years ago
  26. 322df8f Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 98fb65c213 am: 721971a749 by Daniel Xie · 10 years ago
  27. 24ac982 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 am: 0627fca99f am: 12828d9cec am: 187ba3f6b9 am: 056e3679ef am: 193ccb6de4 by Daniel Xie · 10 years ago
  28. 01e5fa8 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f am: e21cd83b3f am: 76bf66b0d2 by Daniel Xie · 10 years ago
  29. 5d8ee19 Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev am: 771d84751a am: 820c2b913f by Unsuk Jung · 10 years ago
  30. 93353a6 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 am: a7eb20734c am: ee5c9c1104 am: ac6b80f47c by Daniel Xie · 10 years ago
  31. 4129976 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours am: e21d47ca3a am: 7049fd4aa8 am: 25eedd0ec7 am: 5c67b0ea1d am: 319007ef55 by Unsuk Jung · 10 years ago
  32. 3f1241e Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: f2fb49577d am: 536bb1b83e by Daniel Xie · 10 years ago
  33. 157f9d1 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours am: 4a7ac53f93 am: 791dc72a71 am: f7eeacf7e0 am: d5f5d23269 am: b8215d7faa am: 6e37387b3d by Daniel Xie · 10 years ago
  34. addb109 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 am: a1d21ae719 am: 56c85d031b by Daniel Xie · 10 years ago
  35. e67078a Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d am: 5287f75394 am: 898b83e8a3 am: 4efb96f249 by Daniel Xie · 10 years ago
  36. 74e113b Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 am: adade48b09 by Daniel Xie · 10 years ago
  37. b13c629 Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee am: e59e98fba4 am: 934091ba0f am: 0336ccd432 by Daniel Xie · 10 years ago
  38. aa0a756 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 am: 0b7028aca6 by Daniel Xie · 10 years ago
  39. 4661ba8 Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours am: f51347ea43 am: eea143b960 am: c252123ed4 am: 78503b6af7 by Daniel Xie · 10 years ago
  40. 1517dc9 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 am: 2dea78fe49 by Daniel Xie · 10 years ago
  41. a90a795 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours am: b0b1f447ad -s ours am: 7fae1232f6 am: 0c4999be9e am: 960f5ce52e am: 4acbcc0bab am: 7d23ba05c9 by Daniel Xie · 10 years ago
  42. 835396a Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev am: 017be55776 by Daniel Xie · 10 years ago
  43. 6185860 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 am: 880fb0f02d by Daniel Xie · 10 years ago
  44. 723baa7 Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d am: bcca855341 am: b1e0468156 am: 39c645a588 am: 7eaa2371b3 am: 1db4cd13c0 am: 2b252bef0c by Daniel Xie · 10 years ago
  45. f38bac3 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 8a95fe92c3 am: 36d3b99c4e by Daniel Xie · 10 years ago
  46. 29f665a Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 5d699eb6fa am: f1ff376b7c am: 964fac3693 am: a9958e1ccf by Daniel Xie · 10 years ago
  47. 35c51ca Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf am: 7d5dab187d am: 170f523ebb by Daniel Xie · 10 years ago
  48. b9f3271 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 am: 423b1a77b9 am: b0538a4994 by Daniel Xie · 10 years ago
  49. 9431506 Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 am: 360e0cd0b4 am: b371e0cf57 am: c34b7b0c8c am: ea4c213e33 am: cfdc28633a by Daniel Xie · 10 years ago
  50. d25ae05 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 am: 22fc1c9d7a by Daniel Xie · 10 years ago
  51. 0c263a7 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 am: 84b3ea0675 am: 9b67b1cd95 am: bcf2a7c22a am: 4cb0e4faa8 by Daniel Xie · 10 years ago
  52. 26e27bc Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 98fb65c213 by Daniel Xie · 10 years ago
  53. 531ab99 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 am: 0627fca99f am: 12828d9cec am: 187ba3f6b9 am: 056e3679ef by Daniel Xie · 10 years ago
  54. e28e10a Merge branch \'mnc-dr2-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr2-dev am: c5e93b5174 by Daniel Xie · 10 years ago
  55. 6611fc8 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f am: e21cd83b3f by Daniel Xie · 10 years ago
  56. 6db2051 Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev am: 771d84751a by Unsuk Jung · 10 years ago
  57. 1c88f22 Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours am: 41f96a4dd8 am: fe0c31b63f am: 636acc997b am: be84267e54 am: 91510bbd00 am: d243bb6b2c by Daniel Xie · 10 years ago
  58. bf1355a Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 am: a7cf6debea am: 2efbe0e620 am: 833bca64a9 am: 65b1e70e1c am: c6857f51ce am: 163226c4b2 by Daniel Xie · 10 years ago
  59. 6f4dc61 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 am: a7eb20734c am: ee5c9c1104 by Daniel Xie · 10 years ago
  60. bc157e6 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours am: e21d47ca3a am: 7049fd4aa8 am: 25eedd0ec7 am: 5c67b0ea1d by Unsuk Jung · 10 years ago
  61. 09b7107 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: f2fb49577d by Daniel Xie · 10 years ago
  62. 096bc17 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours am: 053c2547df am: 3be236000f am: 10405d7838 am: 03b8ef2b6f am: 7a804246f6 am: 7ddb92f0e6 by Daniel Xie · 10 years ago
  63. 2694d27 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours am: 4a7ac53f93 am: 791dc72a71 am: f7eeacf7e0 am: d5f5d23269 am: b8215d7faa by Daniel Xie · 10 years ago
  64. bad9e6b Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 am: a1d21ae719 by Daniel Xie · 10 years ago
  65. e54f547 Merge branch \'mnc-dr2-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr2-dev am: 1ceefe041f by Daniel Xie · 10 years ago
  66. bc1ac6b Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d am: 5287f75394 am: 898b83e8a3 by Daniel Xie · 10 years ago
  67. f9e070c Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: fe0750d778 am: ad4130f511 am: 9d53d593d8 am: b1f1ab707c am: 2bb0829dc2 am: 89a1a443f2 by Daniel Xie · 10 years ago
  68. d8ee6a8 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 by Daniel Xie · 10 years ago
  69. c7b67a7 Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee am: e59e98fba4 am: 934091ba0f by Daniel Xie · 10 years ago
  70. 363e7a6 Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr2-dev-plus-aosp by Daniel Xie · 10 years ago
  71. 66e2af7 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 by Daniel Xie · 10 years ago
  72. a3c010b Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours am: f51347ea43 am: eea143b960 am: c252123ed4 by Daniel Xie · 10 years ago
  73. 389e2e9 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours am: b0b1f447ad -s ours am: 7fae1232f6 am: 0c4999be9e am: 960f5ce52e am: 4acbcc0bab by Daniel Xie · 10 years ago
  74. 6c71059 Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: 376b4ac337 -s ours am: 5fc4a1a509 am: 138c27abaf am: d23c94a275 am: 5ae64ede6f am: 0269000aaa by Daniel Xie · 10 years ago
  75. 42ba331 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 by Daniel Xie · 10 years ago
  76. 62c9d0f Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev by Daniel Xie · 10 years ago
  77. 83cc45f Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d am: bcca855341 am: b1e0468156 am: 39c645a588 am: 7eaa2371b3 am: 1db4cd13c0 by Daniel Xie · 10 years ago
  78. deed25d Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr2-dev-plus-aosp by Daniel Xie · 10 years ago
  79. 08a824f Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 by Daniel Xie · 10 years ago
  80. 224b220 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 8a95fe92c3 by Daniel Xie · 10 years ago
  81. 12a4c46 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 5d699eb6fa am: f1ff376b7c am: 964fac3693 by Daniel Xie · 10 years ago
  82. 1ebdeb7 Merge branch \'mnc-dr2-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr2-dev am: 2809be0264 by Daniel Xie · 10 years ago
  83. 02bbad0 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf am: 7d5dab187d by Daniel Xie · 10 years ago
  84. e7a3136 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 am: 423b1a77b9 by Daniel Xie · 10 years ago
  85. 6304a73 Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 am: 360e0cd0b4 am: b371e0cf57 am: c34b7b0c8c am: ea4c213e33 by Daniel Xie · 10 years ago
  86. 73944a5 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 am: 84b3ea0675 am: 9b67b1cd95 am: bcf2a7c22a by Daniel Xie · 10 years ago
  87. 435db7e Merge branch \'mnc-dr2-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr2-dev by Daniel Xie · 10 years ago
  88. 41c0eba Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: e31a0cd65e -s ours am: a1f2a73c80 am: 635b5216be am: ce1784f658 am: 60a0b17183 am: 502d87440b by Daniel Xie · 10 years ago
  89. 111f8b0 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 by Daniel Xie · 10 years ago
  90. 0cd6463 Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours am: 41f96a4dd8 am: fe0c31b63f am: 636acc997b am: be84267e54 am: 91510bbd00 by Daniel Xie · 10 years ago
  91. 69ddd16 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 85e06a3704 -s ours am: eca552568a am: ff1871a36d am: ca91f60f38 am: 77b53ff4f6 am: 45c0c592b7 by Daniel Xie · 10 years ago
  92. 721971a Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev by Daniel Xie · 10 years ago
  93. 193ccb6 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 am: 0627fca99f am: 12828d9cec am: 187ba3f6b9 by Daniel Xie · 10 years ago
  94. a75c0a0 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: 19d6591ef5 -s ours am: 4114e7e79d am: 76d2dab627 am: 5ae52d3fc1 am: 66b5815850 am: e9e87088e3 by Daniel Xie · 10 years ago
  95. 76bf66b Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f by Daniel Xie · 10 years ago
  96. 820c2b9 Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev by Unsuk Jung · 10 years ago
  97. 615bf0b Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: 1ebab33f28 -s ours am: 437ac4cfcc am: b132e46fc4 am: 820d56b3d7 am: cc7a0efe37 am: 820f62d860 by Daniel Xie · 10 years ago
  98. 1d56531 Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 am: a7cf6debea am: 2efbe0e620 am: 833bca64a9 am: 65b1e70e1c am: c6857f51ce by Daniel Xie · 10 years ago
  99. ac6b80f Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 am: a7eb20734c by Daniel Xie · 10 years ago
  100. 701ac05 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: 1cc811e674 -s ours am: 9f10aa5017 am: c64bdc8741 am: a537fffe67 am: 35b85e2917 am: 78d19603ac by Daniel Xie · 10 years ago