1. 545799e resolved conflicts for merge of 1a927f46 to lmp-mr1-modular-dev by Daniel Xie · 9 years ago
  2. 1a927f4 resolved conflicts for merge of 42b3de74 to lmp-mr1-app-dev by Daniel Xie · 9 years ago
  3. 42b3de7 am 411e928f: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev automerge: fe6938e by Amith Dsouza · 9 years ago
  4. 411e928 Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev by Amith Dsouza · 9 years ago
  5. fe6938e Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev by Amith Dsouza · 9 years ago
  6. 4dd7fbe am c688aa62: am efef9855: am 4053a34a: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e by Daniel Xie · 9 years ago
  7. c688aa6 am efef9855: am 4053a34a: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e by Daniel Xie · 9 years ago
  8. efef985 am 4053a34a: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e by Daniel Xie · 9 years ago
  9. 4053a34 Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev by Daniel Xie · 9 years ago
  10. 6c78c8e Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev by Daniel Xie · 9 years ago
  11. 76053e7 resolve merge conflicts of 6176421 to lollipop-cts-dev. by Daniel Xie · 9 years ago
  12. 6176421 Merge "Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations" into kitkat-cts-dev by Daniel Xie · 9 years ago
  13. a953e1e Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations by Raj Mamadgi · 10 years ago
  14. 75dfa14 am ef6c0b98: am be5ae9fb: am 1d06566c: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2 by Daniel Xie · 9 years ago
  15. ef6c0b9 am be5ae9fb: am 1d06566c: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2 by Daniel Xie · 9 years ago
  16. be5ae9f am 1d06566c: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2 by Daniel Xie · 9 years ago
  17. 1d06566 Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  18. 97fa3a2 Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  19. 2407f75 Accept more than one SD in NsdManagerTest by Filip Matusiak · 10 years ago
  20. fadc473 LocalSocketTest.testAccessors: fix the *SendBufferSize* test by Constantin Musca · 10 years ago
  21. 52951f9 am 39bb0e6b: am 0c6b03d4: am 43b1b930: Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev by Michael Kwan · 9 years ago
  22. 6ce27b2 am 61893350: am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d by Sungsoo Lim · 9 years ago
  23. cea5d1c am fffcb9d9: am 9661871f: am 8d38cdd2: Merge "Projection Widget Test: Remove two unnecessary buttons" into lollipop-mr1-cts-dev by Harsh Modi · 9 years ago
  24. 97698b1 am 58cfc43f: am 5b672fcd: am a1976879: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev automerge: 6a44e14 by Yin-Chia Yeh · 9 years ago
  25. 39bb0e6 am 0c6b03d4: am 43b1b930: Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev by Michael Kwan · 9 years ago
  26. 6189335 am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d by Sungsoo Lim · 9 years ago
  27. fffcb9d am 9661871f: am 8d38cdd2: Merge "Projection Widget Test: Remove two unnecessary buttons" into lollipop-mr1-cts-dev by Harsh Modi · 9 years ago
  28. 58cfc43 am 5b672fcd: am a1976879: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev automerge: 6a44e14 by Yin-Chia Yeh · 9 years ago
  29. 0c6b03d am 43b1b930: Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev by Michael Kwan · 9 years ago
  30. 43b1b93 Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev by Michael Kwan · 9 years ago
  31. bba1edf am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d by Sungsoo Lim · 9 years ago
  32. e45eaab Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  33. 62f111d Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  34. 9661871 am 8d38cdd2: Merge "Projection Widget Test: Remove two unnecessary buttons" into lollipop-mr1-cts-dev by Harsh Modi · 9 years ago
  35. 8d38cdd Merge "Projection Widget Test: Remove two unnecessary buttons" into lollipop-mr1-cts-dev by Harsh Modi · 9 years ago
  36. 5b672fc am a1976879: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev automerge: 6a44e14 by Yin-Chia Yeh · 9 years ago
  37. 561cd49 Projection Widget Test: Remove two unnecessary buttons by Harsh Modi · 9 years ago
  38. a197687 Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  39. 6a44e14 Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  40. b87d4d5 Add CTS for MediaController.TransportControls and its callback by Sungsoo Lim · 9 years ago
  41. 9a359f3 Added layout tweaks to handle small screens for CTS Sensor Test. by Michael Kwan · 9 years ago
  42. cc2fad6 am adaa1e0d: am 21cd3a23: am 8b3f4ba3: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 automerge: 2f901ce automerge: 75fb000 automerge: 5c9059d by Nicholas Sauer · 9 years ago
  43. dd7971d am a96b3463: am 1451c976: am f012b4fc: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 automerge: 64b4f92 automerge: 9ee3ede by Nicholas Sauer · 9 years ago
  44. adaa1e0 am 21cd3a23: am 8b3f4ba3: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 automerge: 2f901ce automerge: 75fb000 automerge: 5c9059d by Nicholas Sauer · 9 years ago
  45. a96b346 am 1451c976: am f012b4fc: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 automerge: 64b4f92 automerge: 9ee3ede by Nicholas Sauer · 9 years ago
  46. 21cd3a2 am 8b3f4ba3: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 automerge: 2f901ce automerge: 75fb000 automerge: 5c9059d by Nicholas Sauer · 9 years ago
  47. 1451c97 am f012b4fc: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 automerge: 64b4f92 automerge: 9ee3ede by Nicholas Sauer · 9 years ago
  48. fce14b1 am ecd9ca31: am eccbd817: am 214e596a: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15ba0e automerge: 6c4b47f automerge: 2614df0 automerge: f400975 by Nicholas Sauer · 9 years ago
  49. a480217 am 3238e10c: am 5804cb37: am 04e6d7cb: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a automerge: 358d417 automerge: 4c725a3 by Marco Nelissen · 9 years ago
  50. a686eb3 am 4bec70f0: am 5d52037f: am fb845761: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc automerge: 877f741 automerge: 7831295 by Marco Nelissen · 9 years ago
  51. a942417 am b3a6d772: am bcf4164b: am 6657d551: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3 automerge: 6f1b9e2 by Eric Laurent · 9 years ago
  52. 0d053a2 am 767aa034: am d4880445: am d5f58b0f: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 automerge: 4659b16 automerge: 8d6ba40 by Unsuk Jung · 9 years ago
  53. 5198ac9 am 8337761d: am 0b2c379b: am dbffa7db: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 automerge: 07a0d2c by Nick Kralevich · 9 years ago
  54. 8b3f4ba am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 automerge: 2f901ce automerge: 75fb000 by Nicholas Sauer · 9 years ago
  55. f012b4f am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 automerge: 64b4f92 by Nicholas Sauer · 9 years ago
  56. 5c9059d am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 automerge: 2f901ce by Nicholas Sauer · 9 years ago
  57. 9ee3ede am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 by Nicholas Sauer · 9 years ago
  58. ecd9ca3 am eccbd817: am 214e596a: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15ba0e automerge: 6c4b47f automerge: 2614df0 automerge: f400975 by Nicholas Sauer · 9 years ago
  59. 3238e10 am 5804cb37: am 04e6d7cb: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a automerge: 358d417 automerge: 4c725a3 by Marco Nelissen · 9 years ago
  60. 4bec70f am 5d52037f: am fb845761: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc automerge: 877f741 automerge: 7831295 by Marco Nelissen · 9 years ago
  61. b3a6d77 am bcf4164b: am 6657d551: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3 automerge: 6f1b9e2 by Eric Laurent · 9 years ago
  62. 767aa03 am d4880445: am d5f58b0f: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 automerge: 4659b16 automerge: 8d6ba40 by Unsuk Jung · 9 years ago
  63. 8337761 am 0b2c379b: am dbffa7db: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 automerge: 07a0d2c by Nick Kralevich · 9 years ago
  64. eccbd81 am 214e596a: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15ba0e automerge: 6c4b47f automerge: 2614df0 automerge: f400975 by Nicholas Sauer · 9 years ago
  65. 5804cb3 am 04e6d7cb: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a automerge: 358d417 automerge: 4c725a3 by Marco Nelissen · 9 years ago
  66. 5d52037 am fb845761: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc automerge: 877f741 automerge: 7831295 by Marco Nelissen · 9 years ago
  67. bcf4164 am 6657d551: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3 automerge: 6f1b9e2 by Eric Laurent · 9 years ago
  68. d488044 am d5f58b0f: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 automerge: 4659b16 automerge: 8d6ba40 by Unsuk Jung · 9 years ago
  69. 0b2c379 am dbffa7db: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 automerge: 07a0d2c by Nick Kralevich · 9 years ago
  70. 214e596 am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15ba0e automerge: 6c4b47f automerge: 2614df0 by Nicholas Sauer · 9 years ago
  71. 04e6d7c am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a automerge: 358d417 by Marco Nelissen · 9 years ago
  72. fb84576 am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc automerge: 877f741 by Marco Nelissen · 9 years ago
  73. 6657d55 am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3 by Eric Laurent · 9 years ago
  74. d5f58b0 am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 automerge: 4659b16 by Unsuk Jung · 9 years ago
  75. dbffa7d Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 by Nick Kralevich · 9 years ago
  76. f400975 am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15ba0e automerge: 6c4b47f by Nicholas Sauer · 9 years ago
  77. 4c725a3 am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a by Marco Nelissen · 9 years ago
  78. 7831295 am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc by Marco Nelissen · 9 years ago
  79. 6f1b9e2 am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff by Eric Laurent · 9 years ago
  80. 8d6ba40 am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 by Unsuk Jung · 9 years ago
  81. 75fb000 am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 by Nicholas Sauer · 9 years ago
  82. 07a0d2c Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 by Nick Kralevich · 9 years ago
  83. 64b4f92 am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc by Nicholas Sauer · 9 years ago
  84. 2614df0 am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15ba0e by Nicholas Sauer · 9 years ago
  85. 358d417 am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 by Marco Nelissen · 9 years ago
  86. 877f741 am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 by Marco Nelissen · 9 years ago
  87. b4aa5b3 am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc by Eric Laurent · 9 years ago
  88. 4659b16 am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 by Unsuk Jung · 9 years ago
  89. 739f204 Don\'t NPE when no security message is provided. automerge: 843c1f4 by Nick Kralevich · 9 years ago
  90. 2f901ce am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev by Nicholas Sauer · 9 years ago
  91. f569614 am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev by Nicholas Sauer · 9 years ago
  92. 6c4b47f am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev by Nicholas Sauer · 9 years ago
  93. 9f02f1a am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev by Marco Nelissen · 9 years ago
  94. 1a174fc am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev by Marco Nelissen · 9 years ago
  95. 3a415ff am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. by Eric Laurent · 9 years ago
  96. 8013ee6 am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev by Unsuk Jung · 9 years ago
  97. 4a04f01 Don\'t NPE when no security message is provided. automerge: 843c1f4 by Nick Kralevich · 9 years ago
  98. c5fda94 am f0f1d16b: am 2d9c2894: am ec4b77b7: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev automerge: 6d4a6d3 by Sungsoo Lim · 9 years ago
  99. bcbaab2 am 979b382c: am a1e639c0: am 46976b72: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev automerge: 32e17d4 by Sungsoo Lim · 9 years ago
  100. f0f1d16 am 2d9c2894: am ec4b77b7: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev automerge: 6d4a6d3 by Sungsoo Lim · 9 years ago