Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / cts / 38a248ca3930353baa1bef1eed6603e462c928f3
  1. 38a248c am c2c6a441: am 39f73105: am 9e2a0079: am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours by Daniel Xie · 9 years ago
  2. 03eb85b am d0e6536c: am cd76983e: am 8850bf3e: am 4fab34db: am 185dc031: am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev by Daniel Xie · 9 years ago
  3. 5a13d92 am 1ca18a35: am e946d61a: am 2cbc624d: am abe4571b: am dd9c9939: am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e by Daniel Xie · 9 years ago
  4. 7077923 am 6851aa36: am 9e787d47: am 4c9a67c6: am be979228: am 13b5095a: am 6e8f6a77: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours by Daniel Xie · 9 years ago
  5. b85fad0 am 3ec43f18: am 577b2cd8: am 6738c33a: am 21abb843: am 9585f9ca: am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  6. 85874ec am 3b6a3e92: am a5096064: am 4e167519: am 985ab652: am e6af3f8e: am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 by Lance Jin-woong Chang · 9 years ago
  7. 7fdb4b1 am 357f2eea: am 152da67b: am c76e0e70: am 1428fbba: am f2f32342: am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 by Daniel Xie · 9 years ago
  8. c2c6a44 am 39f73105: am 9e2a0079: am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours by Daniel Xie · 9 years ago
  9. d0e6536 am cd76983e: am 8850bf3e: am 4fab34db: am 185dc031: am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev by Daniel Xie · 9 years ago
  10. 1ca18a3 am e946d61a: am 2cbc624d: am abe4571b: am dd9c9939: am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e by Daniel Xie · 9 years ago
  11. 6851aa3 am 9e787d47: am 4c9a67c6: am be979228: am 13b5095a: am 6e8f6a77: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours by Daniel Xie · 9 years ago
  12. 3ec43f1 am 577b2cd8: am 6738c33a: am 21abb843: am 9585f9ca: am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  13. 3b6a3e9 am a5096064: am 4e167519: am 985ab652: am e6af3f8e: am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 by Lance Jin-woong Chang · 9 years ago
  14. 357f2ee am 152da67b: am c76e0e70: am 1428fbba: am f2f32342: am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 by Daniel Xie · 9 years ago
  15. a7fcde9 am 43608070: am 2aaeb74e: am bb75771e: resolved conflicts for 50d071ae to lmp-mr1-dev by Unsuk Jung · 9 years ago
  16. 39f7310 am 9e2a0079: am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours by Daniel Xie · 9 years ago
  17. cd76983 am 8850bf3e: am 4fab34db: am 185dc031: am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev by Daniel Xie · 9 years ago
  18. e946d61 am 2cbc624d: am abe4571b: am dd9c9939: am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e by Daniel Xie · 9 years ago
  19. 9e787d4 am 4c9a67c6: am be979228: am 13b5095a: am 6e8f6a77: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours by Daniel Xie · 9 years ago
  20. 577b2cd am 6738c33a: am 21abb843: am 9585f9ca: am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  21. a509606 am 4e167519: am 985ab652: am e6af3f8e: am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 by Lance Jin-woong Chang · 9 years ago
  22. 152da67 am c76e0e70: am 1428fbba: am f2f32342: am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 by Daniel Xie · 9 years ago
  23. 4360807 am 2aaeb74e: am bb75771e: resolved conflicts for 50d071ae to lmp-mr1-dev by Unsuk Jung · 9 years ago
  24. 9e2a007 am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours by Daniel Xie · 9 years ago
  25. 8850bf3 am 4fab34db: am 185dc031: am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev by Daniel Xie · 9 years ago
  26. 2cbc624 am abe4571b: am dd9c9939: am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e by Daniel Xie · 9 years ago
  27. 4c9a67c am be979228: am 13b5095a: am 6e8f6a77: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours by Daniel Xie · 9 years ago
  28. 6738c33 am 21abb843: am 9585f9ca: am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  29. 4e16751 am 985ab652: am e6af3f8e: am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 by Lance Jin-woong Chang · 9 years ago
  30. c76e0e7 am 1428fbba: am f2f32342: am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 by Daniel Xie · 9 years ago
  31. 2aaeb74 am bb75771e: resolved conflicts for 50d071ae to lmp-mr1-dev by Unsuk Jung · 9 years ago
  32. bb75771 resolved conflicts for 50d071ae to lmp-mr1-dev by Unsuk Jung · 9 years ago
  33. 9b45472 am 70a541c6: am f46b0b4f: am 9351dc40: am 1c886754: am a8dbf0d0: am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 9 years ago
  34. adfecbb am b78c057c: am d1b66025: am e3fcbefe: am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 9 years ago
  35. 856de23 am fe003d49: am c412101e: am 98149a1f: am b8cde03b: am 6d54adae: am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev by Esteban Talavera · 9 years ago
  36. 6bcd33f am e939be86: (-s ours) am 034388a3: am 7b94b84a: am 146de78c: am d5225f3f: am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 9 years ago
  37. 69a8277 am c9ef51db: am 85858789: am df6399ec: am 1fc2d9bb: am 343a7f01: am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  38. 4a46fcf am ed2e9131: am a0d2bc9f: am ef10accc: am 0e353da8: am fa487921: am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  39. 3530408 am ab185f92: am a629f8ef: am d1e56632: am c2aaa543: am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  40. 1a76036 am 1f5c0f39: am d43b604a: am c24e0207: resolved conflicts for 03f41fc7 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  41. 804ef68 am a476cbd9: am c25d8b9c: am 502b837b: resolved conflicts for b5499ef5 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  42. 70a541c am f46b0b4f: am 9351dc40: am 1c886754: am a8dbf0d0: am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 9 years ago
  43. b78c057 am d1b66025: am e3fcbefe: am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 9 years ago
  44. fe003d4 am c412101e: am 98149a1f: am b8cde03b: am 6d54adae: am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev by Esteban Talavera · 9 years ago
  45. e939be8 am 034388a3: am 7b94b84a: am 146de78c: am d5225f3f: am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 9 years ago
  46. c9ef51d am 85858789: am df6399ec: am 1fc2d9bb: am 343a7f01: am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  47. ed2e913 am a0d2bc9f: am ef10accc: am 0e353da8: am fa487921: am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  48. ab185f9 am a629f8ef: am d1e56632: am c2aaa543: am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  49. 1f5c0f3 am d43b604a: am c24e0207: resolved conflicts for 03f41fc7 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  50. a476cbd am c25d8b9c: am 502b837b: resolved conflicts for b5499ef5 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  51. f46b0b4 am 9351dc40: am 1c886754: am a8dbf0d0: am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 9 years ago
  52. d1b6602 am e3fcbefe: am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 9 years ago
  53. c412101 am 98149a1f: am b8cde03b: am 6d54adae: am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev by Esteban Talavera · 9 years ago
  54. 034388a am 7b94b84a: am 146de78c: am d5225f3f: am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 9 years ago
  55. 8585878 am df6399ec: am 1fc2d9bb: am 343a7f01: am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  56. a0d2bc9 am ef10accc: am 0e353da8: am fa487921: am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  57. a629f8e am d1e56632: am c2aaa543: am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  58. d43b604 am c24e0207: resolved conflicts for 03f41fc7 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  59. c25d8b9 am 502b837b: resolved conflicts for b5499ef5 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  60. 9351dc4 am 1c886754: am a8dbf0d0: am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 9 years ago
  61. e3fcbef am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 9 years ago
  62. 98149a1 am b8cde03b: am 6d54adae: am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev by Esteban Talavera · 9 years ago
  63. 7b94b84 am 146de78c: am d5225f3f: am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 9 years ago
  64. df6399e am 1fc2d9bb: am 343a7f01: am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  65. ef10acc am 0e353da8: am fa487921: am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  66. d1e5663 am c2aaa543: am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  67. c24e020 resolved conflicts for 03f41fc7 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  68. c577631 Merge "add more binder tests for AudioFlinger and AudioPolicyService." into mnc-dev by Wei Jia · 9 years ago
  69. 16ea5a0 Merge "media: don't fail the test if encoder is still active." into mnc-dev by Ronghua Wu · 9 years ago
  70. 5496c88 am 8cc5f1ae: am f3513456: am 5a6823b5: am d47f0c37: am d95836ae: am 79d97606: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev by Daniel Xie · 9 years ago
  71. 3da256a am 50858f99: am 451fb15a: am ed1b9b16: am 20503b03: am 82cd5e5c: am 81e14f4e: Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours by Daniel Xie · 9 years ago
  72. a77a7b0 am d5122706: am cce94f99: am db88ffb3: am 52f65bd8: am 86cc8140: am 23c49fbf: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 by Daniel Xie · 9 years ago
  73. 39edfdd am 4b21ed39: am 2a2a703f: am 9797f393: am 2cdc65f5: am cdad0572: am eb4eb9e9: Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev by Daniel Xie · 9 years ago
  74. c3dd8a9 am b28ea107: am 5fd98c40: am 76ddde6b: am c80863be: am e7b7f417: am c304eedd: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev by Daniel Xie · 9 years ago
  75. e9a9ced am 7aaf0a68: am e99cf6e5: am 07eaa81a: am 752a6964: am 025bd02c: am 87a13283: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev by Daniel Xie · 9 years ago
  76. f489a65 am 2496b217: am 3009899a: am 7f75869d: am 4d32e370: am 0e753a86: am df91c971: Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev by Daniel Xie · 9 years ago
  77. 6d53e24 am 812fccf2: am 69139353: am e16977e4: resolved conflicts for 2dbf3b3a to lmp-mr1-dev by Unsuk Jung · 9 years ago
  78. aaf33be am 34097444: am 7581df6e: am 00720760: am 3e3e71b9: am 9b5b9f41: am bfabed1f: Merge "Revert "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing other combinations."" into by Daniel Xie · 9 years ago
  79. 74c54d0 am f4a7a4a8: (-s ours) am 5111ea11: am b249166a: am 2cab845b: am 099280e9: am 4e80dc17: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours by Daniel Xie · 9 years ago
  80. 623d5a4 am 9368b3a7: am 648eff8d: am 7766fe40: am 2eabe31f: am fe7fbbb1: am 076e7ea4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f by Daniel Xie · 9 years ago
  81. 3b937d4 am dd9543b7: am 8881bc9f: am 5811239f: am c22598cd: am 9b3abc67: am 880e4ac7: Merge "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing other combinations." into kitkat-c by Daniel Xie · 9 years ago
  82. 21f60cc am 2d02a772: (-s ours) am a4e32202: am 3f771647: am a5d2ab68: am 7e0fc271: am e711a36e: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev automerge: b3405de -s ours by Daniel Xie · 9 years ago
  83. 05da1be am 20dfd714: am ccd33374: am 8933b440: am 3c8e9b98: am c50d2847: am ccde590a: Merge "Add more CTS for MediaController" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  84. 72f1102 am 85a61404: am 9597a1b6: am fba6cc5a: am a562ddcf: am 5adf372c: am 4aeb538d: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  85. f5afe71 am fd2c22e6: am a01d8468: am 964f1c30: am bff9958d: am f99cc4ba: am b7703ecb: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  86. 3c99307 am 0af999e7: am 10861d56: am cb7d9562: am 65cb7f94: am 26c7d928: am 4c8ddbd9: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  87. 2e458fa am d9eacf0b: am 6f454c3e: am e1357cdc: am 7dcb52fa: am 5a179fac: am a5945eea: Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev by Daniel Xie · 9 years ago
  88. af96e73 am 0d9cb797: (-s ours) am b679acbf: am dd40995a: am 5d3becd8: am 1f314046: am c0edc3c6: (-s ours) Merge "[DO NOT MERGE]Fix ION memory leak for camera2 testStillPreviewCombination" into lollipop-cts-dev by Daniel Xie · 9 years ago
  89. c00de99 am a5f00083: am e1d2fb8e: am a0238f23: am b556e58b: am 1564a126: am 715fe887: Merge "Fix for testListen" into lollipop-cts-dev by Daniel Xie · 9 years ago
  90. be86442 am 1303e6cc: am d4deaa42: am 58849263: am 92151993: am 45d23b25: am 34ece2dd: Merge "5.0_r1 Verifier:Fix no-connectivity constraint job missing running issue" into lollipop-cts-dev by Daniel Xie · 9 years ago
  91. 4e9d91d am 588b010a: am d110bdce: am 3ab9365b: am 9cce00c4: am bf2a69dd: am 76b1710a: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev by Daniel Xie · 9 years ago
  92. 900e5cd am 68754fee: am 8b693a4c: am 37bda1b5: am f1e31663: am 53d45920: am 5ac9f6cd: Merge "Add 44051 to NO_DELIVERY_REPORTS, DATA_SMS, MULTIPART_SMS" into kitkat-cts-dev automerge: 10212a1 by Daniel Xie · 9 years ago
  93. 4d6f447 am cd5b5201: am d9895704: am 0a4f62b4: am 4c5153cc: am 9030efde: am c18e0e89: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev by Marco Nelissen · 9 years ago
  94. 2279ada am ae1a468b: am c009ee86: am 3dd29899: am 9845d105: am e60989be: am fe6938e0: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev by Amith Dsouza · 9 years ago
  95. 42453b8 am 4f54ebea: am d12cfe3a: am 401ba747: am 3f797832: am b01b8167: am 6c78c8e8: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev by Daniel Xie · 9 years ago
  96. 609f338 am 38dffb0c: am 582a23d3: am 779d4b9f: am 01a76822: am 95d7fb57: am 97fa3a23: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  97. 8fd5bc4 am 4fdeb4fa: am 7076fb87: am 046788c3: am 5d17be68: am 8d782e4e: am 62f111d0: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  98. 1aa848a am f7ba161a: am 16a8d4a0: am 6dbb9057: am 839d28c5: am 7dae8e29: am 6a44e145: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  99. 53b9d10 am a0df5a46: am f233018c: am b1d3dc85: am c3884911: am d8a0fb40: am 5c9059dc: 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 aut by Nicholas Sauer · 9 years ago
  100. 465e1ec am 0a69d4e0: am a41a3aa5: am 1174a61d: am 6b6e6310: am 12e9a5f5: am 9ee3edef: 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