Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / cts / 3c424d8903825e291bfff6f5515fb5071ead980b
  1. 3c424d8 am 273a9b48: am 3240517a: am 2c394f33: am 34580718: am 8a91dd93: am 07a0d2cb: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 by Nick Kralevich · 9 years ago
  2. e028a298 am 4ebd35a1: am 42b34a08: am 1ab443ce: am ce4fbf95: am ad388cb4: am 6d4a6d3e: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  3. cb033e4 am c9b86480: am 0656daf2: am 05e0b021: am 3b6fb36b: am 9540df0e: am 32e17d40: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  4. cab55cf am e1e375f3: am fea2508f: am d4f9511d: am e8603c1e: am b5166b1d: am 71a8a6d7: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  5. 47da001 am a57220bd: am ab6a8ff3: am a439879e: am b27aa047: am dbc90b9f: am 6585d2a7: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  6. 76b94e8 am e36536b4: am f33bdf70: am bc2ae97b: am 46132125: am 764f3230: am f460e3e3: Merge "TIF: Add test case for TvView.TvInputCallback.onConnectionFailed()" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  7. 7edcfd8 am 6a3e79be: am 955a4e15: am 6f9c3b95: am dbb094eb: am 741da47e: am 98641202: Merge "Disable WebGL tests from CTS" into lollipop-cts-dev by Bo Liu · 9 years ago
  8. 0c50670 am 38ab62cd: am 688e98f6: am 1ce9068f: am eafbef5b: am 4d55d0c8: am a2fe7980: Merge "Modify user agent CTS test to match new webview user agent string." into lollipop-cts-dev by Richard Coles · 9 years ago
  9. 651a8c6 am 22cdf49e: am 8e05d564: am 7f8290d8: am 5fccef72: am be695cf3: am 77c931d2: Merge "TIF: Add missing test cases for TvInputService" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  10. ef8069d am 4ebaf64e: am 567ad1c7: am 8cb19ec2: am 765ff619: am 8265b25d: am ebc0ba05: Merge "TIF: Add missing test cases for TvInputManager" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  11. c37b17f am 39b73f09: am 22eaf671: am 72e6b133: am 563c1d85: am 1941c847: am 448d1e11: Merge "TIF: Add test cases for TvContract.Channels and TvContact.Programs.Genres" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  12. 3f1c624 am c3be0ada: am 9c07f137: am 54baba8a: am d4de676c: am 4e263ec8: am d8f754a0: Merge "TIF: Add missing tests for android.media.tv.TvInputInfo" into lollipop-cts-dev by Jae Seo · 9 years ago
  13. 05b4c7c am cfa92e98: am 02e2308c: am 11ae8134: am a1da7950: am b25ca64e: am 3682098c: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev by Fyodor Kupolov · 9 years ago
  14. 72992b8 am e2d082a4: am b34daa4d: am cffaef77: am a36f4549: am 8de92c56: am cd3d7bea: Merge "TIF: Add tests for TvTrackInfo" into lollipop-cts-dev by Jae Seo · 9 years ago
  15. 914c2b5 am 9253e215: am 853a6d85: am 3ce3144f: am 7c6e5cfe: am ea0dab91: am b51c8ca0: Merge "Camera: fix Integer comparison" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  16. bc538fb am e2c659fa: am 1e74f6cd: am 2558c0d9: am 142c801b: am d7559538: am 3e841ca3: Merge "mediastress: move check for support to the beginning of the test." into lollipop-cts-dev by Ronghua Wu · 9 years ago
  17. 9483fd1 am 17e7a85b: am af2e45e1: am 41bfb1aa: am 1acec5e3: am 370df7e1: am 6f810d46: Merge "Add CTS-verifier test to test cross profile media capture." into lollipop-cts-dev by Sander Alewijnse · 9 years ago
  18. eb179fc am 076f394f: am ecee083d: am e6bc17b5: am c38391f0: am 4a10f810: am 958c8013: Merge "Camera: fix wrong String.format argument" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  19. e70dc9a am e6418a09: am 1bdd7ad9: am 8e5754b6: am 22c2a2fd: am 771466f6: resolved conflicts for da76169f to lmp-dev by Dongwon Kang · 9 years ago
  20. 2da0ef8 am 6a034246: am 4908ad5f: am cf166d70: am e81c9f1d: am 0a7a8526: am 50f311e5: Merge "Camera: another legacy video recording fix" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  21. b1c56c4 am 3ce666e1: am 2b337573: am fa856351: am 68c7b0e6: am 062f04bc: am 68b8b477: Merge "Refactoring the ThemeHostTest to reduce timeout." into lollipop-cts-dev by Alain Vongsouvanh · 9 years ago
  22. 41fbc31 am 6a81f38d: am 57905b29: am 27e79236: am db070d60: am f30bd972: am 1a856693: Merge "TIF: Make a title for CTS verifier test case clearer" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  23. f3d5d7f am e31cd3c6: am ef595fb1: am 4bf57508: am ce468740: resolved conflicts for 283b37b7 to lmp-sprout-dev by Dongwon Kang · 9 years ago
  24. 283de84 am c1ecc48d: am dd70e436: am 32203af8: am 9fde6600: resolved conflicts for 13cf1e9c to lmp-sprout-dev by Wonsik Kim · 9 years ago
  25. 25651c6 am bd245f29: am 6b971077: am 8c3f6481: am 6312b839: resolved conflicts for b183245d to lmp-sprout-dev by Wonsik Kim · 9 years ago
  26. 206babc am 783aa1b0: am dbe26b09: am 5cf4d75d: am b66220f6: resolved conflicts for 8414fcb7 to lmp-sprout-dev by Wonsik Kim · 9 years ago
  27. 0e7ce18 am bf28a2fe: am 68b4fa0f: am a5d122eb: resolved conflicts for 17b3ebf4 to lmp-mr1-dev by Dongwon Kang · 9 years ago
  28. 6418903 am a5e624a6: (-s ours) am 531d140b: am ac40dcc8: am 4bedf216: am 5c24639d: am dcef6e38: (-s ours) am b0b23ffd: am 08b178a8: DO NOT MERGE - Add security test for IEffect binder command by Andy Hung · 9 years ago
  29. 87405a8 am 3bd35f32: (-s ours) am f2951ae7: am a5d8d21b: am 3266d75d: resolved conflicts for 6002f099 to lmp-sprout-dev by Andy Hung · 9 years ago
  30. 7873351 am 4eafd543: am 4934d988: am 9f0c8e82: am 10120117: am a404aa89: am ed577509: Merge "Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand." into lollipop-cts-dev by Alain Vongsouvanh · 9 years ago
  31. d769484 am 0a9d413f: (-s ours) am 92a2a098: am 15358c6b: am 32613d31: am 24a62224: am 89c8f21c: (-s ours) Merge "DO NOT MERGE - Fixed the order of parameters passing" into lmp-sprout-dev by Daniel Xie · 9 years ago
  32. 359ea8b am 379f2e31: am f4209d7f: am 9511bb2e: am 0fbc0246: am efe12962: am d3a257ee: Merge "Auto-test for BLE client." into lmp-sprout-dev by Daniel Xie · 9 years ago
  33. f561595 am 0bf62b0f: am fc1f3f6c: am 6775d4c0: am 1b546c62: am a21c69a8: am 18640baa: Merge "Select common codecs for MediaCodecTest.testException" into lmp-sprout-dev by Daniel Xie · 9 years ago
  34. 5608f29 am 9557621f: am 700ac21b: am 3b99ceeb: am 35f059f6: am 500cd8ca: am ae1b0a05: check decode cap before runing mediastress playerTest by ywan171 · 9 years ago
  35. 5e1fe62 am 1e69105b: am 0c3b7274: am 1b0c9a4f: am 76bfae6d: am 5657a062: am 695af1fa: Update low ram device test for new memory requirements by Nicholas Sauer · 9 years ago
  36. c9281d8 am 402f4011: am 03e07c7f: am bf97a00a: am 2bdaf2a1: am 8c286217: am 44204f68: Amending testcase to support updated memory requirement for L. by Daniel Xie · 9 years ago
  37. d6808b3 am e7c85473: am 1aeaba16: am 35a2bfd3: am 044eb18c: am eb0a7024: resolved conflicts for 32bb2005 to lmp-dev by Yin-Chia Yeh · 9 years ago
  38. daa8859 am 50dbdbc3: am a3052a03: am 40c8df21: am 77aa49b7: am 0690f02e: am c21341ec: Merge "CameraITS: fix wrong fixed focus lens logic" into lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  39. 6f5a125 am caf4bd00: (-s ours) am 484f1a2e: am 711e49e5: am 22d5f250: am 4e388a77: am fa71d40c: (-s ours) DO NOT MERGE Add UiAutomationTest#testWindowContentFrameStats to knownfailures by Unsuk Jung · 9 years ago
  40. 7cb290f am 909d5e7a: am db2c8c06: am 9c072750: am 68488024: am 0e7c5837: am b40bc889: Merge "Disable Notification Package Prior item for the watch feature" into lmp-sprout-dev by Takayuki Hoshi · 9 years ago
  41. ba1be01 am 7579cfbd: (-s ours) am 8f3818c7: am 73efff7e: am 597f0d8a: am 04e99c51: am 2024fae2: (-s ours) DO NOT MERGE: camera2 CTS: Actually close Images in StillCaptureTest. by Ruben Brunk · 9 years ago
  42. b4e224c am 2fd9b68c: am e2b88dd4: am a1bc6bde: am 106b6734: am 4c2ff297: am 755f327f: Merge "Disable BLE offloaded scan batching test" into lmp-sprout-dev by Unsuk Jung · 9 years ago
  43. a662c9e am bfb42226: am 08f0affe: am 5a5efc62: am 11076f2b: am 32f21834: am 0a9f5b13: Merge "Disable test to verifying BLE offloaded scan batching" into lmp-sprout-dev by Unsuk Jung · 9 years ago
  44. 5c01b52 am 811a5df7: am 4732c772: am 2091c9d6: am ec4ebca6: am 0c914add: am efbda486: Skip tests that depend on system resources and assets.. by Narayan Kamath · 9 years ago
  45. 9699681 am a002ffa9: am d4b3b364: am 5e559d26: am 8b25ee96: am 4201266d: am 055ca5b6: ConsumerIrTest: add the right permission for some test case by Sunny_Shao · 9 years ago
  46. de384d6 am 4bcc0580: am f07b488e: am 6a8dad25: am fcf719d6: am 223c2ddb: am 44e09b47: Merge "Add cts test for testing launcher version." into lmp-sprout-dev by Sander Alewijnse · 9 years ago
  47. c64b8f2 am 162c0444: am 1b27b143: am 15b79989: am 2795a64d: am e19f335f: am fc60c4c3: CameraITS: improve ITS user experience by Yin-Chia Yeh · 9 years ago
  48. dced4bd am e154e730: am eac47aaf: am bd5bfe2f: am 126c3d7e: am 04faf13a: am 3dd9f1ec: Fix testPageScroll by not using waitForIdleSync. by Bo Liu · 9 years ago
  49. 9981d6b am b0161879: am a4f1fb59: am 8b715115: am cccd8f7c: am 4ca392ca: am 335a73ee: Merge "CameraITS: fix fixed focus lens check" into lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  50. c36a66c am 65b3df90: am 43f35421: am 4d9e4dfc: am d60b7656: am f91b8851: am b05a90b5: Merge "Hide BLE scanner test if BLE advertiser test is hidden." into lmp-sprout-dev by Yicheng Fan · 9 years ago
  51. f68f592 am 0f27645b: am 3e72b1d6: am 54020929: am b1c47db5: am ab9b8eb6: am 332674c2: Merge "Camera: add missing FULL level expectation" into lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  52. 3ee4640 am f79c80b0: am 9a3bde81: am 39a341cf: am eedd977d: am bd21a959: am a36ed7c1: Merge "Camera: fix recording test for legacy mode" into lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  53. 96a8c3a am 8b87db02: am 40825b78: am b44c2026: am a38ac188: am a333975e: resolved conflicts for b7c771fc to lmp-dev by Yin-Chia Yeh · 9 years ago
  54. b68b2c7 am a9211444: am 58e3f579: am e274f3c4: am f406b544: am 26cab4c8: am d43e4fd9: am bb8b3aa6: am 1ab73263: Merge "Add test for Keystore put overflow" into klp-dev by Chad Brubaker · 9 years ago
  55. 8740555 am 03b2a014: am 436ff357: am 59c49231: am 7e8bbb26: am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow by Robert Shih · 9 years ago
  56. 448bc23 am 1660d7d2: am c7c9c4c1: am d40a05d1: am 8e908f24: am 32fa2bc0: am f3517f18: Merge "Advertise 31 bytes in BLE advertise tests." into lmp-sprout-dev by Yicheng Fan · 9 years ago
  57. ebbae3a9 am 5cdb1cdc: am ec5d3f7b: am 0deee593: am 53cee77b: am 5dd2c7da: am f7696b87: Merge "CameraITS: update test_capture_result" into lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  58. c124c05 am e7882151: am b8a97572: am a7166578: am 89f03fa9: am 5aa3406d: am 7fd06374: Fix possible race condition in Sensor CTS framework. by Aravind Akella · 9 years ago
  59. 57b53d9 am c6909f4a: am 13df946c: am acb2553c: am 632f8bb3: am 76ad4e6d: am 7e6371ab: Merge "Replace getContext with getTargetContext." into lmp-sprout-dev by Narayan Kamath · 9 years ago
  60. 8cbc5a7 am fa7b45dd: am 9800b063: am b63e588f: am 97af9332: am 54005969: am 542c2844: media: update vp9 360p test clip with tile columns and frame parallel mode turned on. by Ronghua Wu · 9 years ago
  61. f35b4f1 am 6fb92f4e: am dde6270f: am 57222a19: am 5e66df9f: am 3a86d93f: am 7fc44c34: Merge "update EncoderVirtualDisplayTest to use very long i-frame interval." into lmp-sprout-dev by Unsuk Jung · 9 years ago
  62. 4a8b28c am 0a29079b: am a2ef610c: am 93c0cfc9: am a4dc5fe2: am 93fb3cab: am 590472d9: Enable hardware scan filter test on device which supports the feature. by Yicheng Fan · 9 years ago
  63. d8f6d74 am 2b835303: am 8616659a: am 9e0d6022: am fc33acb2: am 00e937fa: am 8eb56465: Merge "Remove hardware scan filter test, and re-enable BLE advertise/scanner test." into lmp-sprout-dev by Yicheng Fan · 9 years ago
  64. 5c825a4 am 331ed28b: am d81ff9d5: am c3926080: am 08f1480d: am d158fe3e: am 1381382e: Merge "CameraITS: various ITS improvement" into lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  65. e9d91e2 am 80e14290: am 87670398: am d4b790c4: am 848f9cce: am e5e8101b: am 3fefecef: Merge "Add test for checking max users > 1 if managed users feature enabled" into lmp-sprout-dev by Sander Alewijnse · 9 years ago
  66. 0a0f2ce am 8b723f44: am dbebdf95: am 6cf27e6a: am ca472a36: am 325a4115: am 6a13e8da: Merge "More cts-verifier tests for profile-aware Settings." into lmp-sprout-dev by Rubin Xu · 9 years ago
  67. b13b0ac am 0fe39d72: am 73134685: am 61a4fce3: am 84283992: am 6e499f6f: am fb758de5: Merge "Add CTS test to test Setup wizard Nfc config." into lmp-sprout-dev by Sander Alewijnse · 9 years ago
  68. 96822b8 am 2b6b6602: (-s ours) am 957e7237: am 2f9f62e6: am 85ac1535: am ba5ed70d: am ba893966: (-s ours) Disable screen pinning test on watches and tvs. DO NOT MERGE by Jason Monk · 9 years ago
  69. 4af59c7 am 1586e21d: am 34702aa5: am 22df270e: am 5f0c7c63: resolved conflicts for 0ac66cea to lmp-sprout-dev by Unsuk Jung · 9 years ago
  70. 273a9b4 am 3240517a: am 2c394f33: am 34580718: am 8a91dd93: am 07a0d2cb: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 by Nick Kralevich · 9 years ago
  71. 4ebd35a am 42b34a08: am 1ab443ce: am ce4fbf95: am ad388cb4: am 6d4a6d3e: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  72. c9b8648 am 0656daf2: am 05e0b021: am 3b6fb36b: am 9540df0e: am 32e17d40: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  73. e1e375f am fea2508f: am d4f9511d: am e8603c1e: am b5166b1d: am 71a8a6d7: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  74. a57220b am ab6a8ff3: am a439879e: am b27aa047: am dbc90b9f: am 6585d2a7: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  75. e36536b am f33bdf70: am bc2ae97b: am 46132125: am 764f3230: am f460e3e3: Merge "TIF: Add test case for TvView.TvInputCallback.onConnectionFailed()" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  76. 6a3e79b am 955a4e15: am 6f9c3b95: am dbb094eb: am 741da47e: am 98641202: Merge "Disable WebGL tests from CTS" into lollipop-cts-dev by Bo Liu · 9 years ago
  77. 38ab62c am 688e98f6: am 1ce9068f: am eafbef5b: am 4d55d0c8: am a2fe7980: Merge "Modify user agent CTS test to match new webview user agent string." into lollipop-cts-dev by Richard Coles · 9 years ago
  78. 22cdf49 am 8e05d564: am 7f8290d8: am 5fccef72: am be695cf3: am 77c931d2: Merge "TIF: Add missing test cases for TvInputService" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  79. 4ebaf64 am 567ad1c7: am 8cb19ec2: am 765ff619: am 8265b25d: am ebc0ba05: Merge "TIF: Add missing test cases for TvInputManager" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  80. 39b73f0 am 22eaf671: am 72e6b133: am 563c1d85: am 1941c847: am 448d1e11: Merge "TIF: Add test cases for TvContract.Channels and TvContact.Programs.Genres" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  81. c3be0ad am 9c07f137: am 54baba8a: am d4de676c: am 4e263ec8: am d8f754a0: Merge "TIF: Add missing tests for android.media.tv.TvInputInfo" into lollipop-cts-dev by Jae Seo · 9 years ago
  82. cfa92e9 am 02e2308c: am 11ae8134: am a1da7950: am b25ca64e: am 3682098c: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev by Fyodor Kupolov · 9 years ago
  83. e2d082a am b34daa4d: am cffaef77: am a36f4549: am 8de92c56: am cd3d7bea: Merge "TIF: Add tests for TvTrackInfo" into lollipop-cts-dev by Jae Seo · 9 years ago
  84. 9253e21 am 853a6d85: am 3ce3144f: am 7c6e5cfe: am ea0dab91: am b51c8ca0: Merge "Camera: fix Integer comparison" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  85. e2c659f am 1e74f6cd: am 2558c0d9: am 142c801b: am d7559538: am 3e841ca3: Merge "mediastress: move check for support to the beginning of the test." into lollipop-cts-dev by Ronghua Wu · 9 years ago
  86. 17e7a85 am af2e45e1: am 41bfb1aa: am 1acec5e3: am 370df7e1: am 6f810d46: Merge "Add CTS-verifier test to test cross profile media capture." into lollipop-cts-dev by Sander Alewijnse · 9 years ago
  87. 076f394 am ecee083d: am e6bc17b5: am c38391f0: am 4a10f810: am 958c8013: Merge "Camera: fix wrong String.format argument" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  88. e6418a0 am 1bdd7ad9: am 8e5754b6: am 22c2a2fd: am 771466f6: resolved conflicts for da76169f to lmp-dev by Dongwon Kang · 9 years ago
  89. 6a03424 am 4908ad5f: am cf166d70: am e81c9f1d: am 0a7a8526: am 50f311e5: Merge "Camera: another legacy video recording fix" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  90. 3ce666e am 2b337573: am fa856351: am 68c7b0e6: am 062f04bc: am 68b8b477: Merge "Refactoring the ThemeHostTest to reduce timeout." into lollipop-cts-dev by Alain Vongsouvanh · 9 years ago
  91. 6a81f38 am 57905b29: am 27e79236: am db070d60: am f30bd972: am 1a856693: Merge "TIF: Make a title for CTS verifier test case clearer" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  92. e31cd3c am ef595fb1: am 4bf57508: am ce468740: resolved conflicts for 283b37b7 to lmp-sprout-dev by Dongwon Kang · 9 years ago
  93. c1ecc48 am dd70e436: am 32203af8: am 9fde6600: resolved conflicts for 13cf1e9c to lmp-sprout-dev by Wonsik Kim · 9 years ago
  94. bd245f2 am 6b971077: am 8c3f6481: am 6312b839: resolved conflicts for b183245d to lmp-sprout-dev by Wonsik Kim · 9 years ago
  95. 783aa1b am dbe26b09: am 5cf4d75d: am b66220f6: resolved conflicts for 8414fcb7 to lmp-sprout-dev by Wonsik Kim · 9 years ago
  96. bf28a2f am 68b4fa0f: am a5d122eb: resolved conflicts for 17b3ebf4 to lmp-mr1-dev by Dongwon Kang · 9 years ago
  97. a5e624a am 531d140b: am ac40dcc8: am 4bedf216: am 5c24639d: am dcef6e38: (-s ours) am b0b23ffd: am 08b178a8: DO NOT MERGE - Add security test for IEffect binder command by Andy Hung · 9 years ago
  98. 3bd35f3 am f2951ae7: am a5d8d21b: am 3266d75d: resolved conflicts for 6002f099 to lmp-sprout-dev by Andy Hung · 9 years ago
  99. 4eafd54 am 4934d988: am 9f0c8e82: am 10120117: am a404aa89: am ed577509: Merge "Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand." into lollipop-cts-dev by Alain Vongsouvanh · 9 years ago
  100. 0a9d413 am 92a2a098: am 15358c6b: am 32613d31: am 24a62224: am 89c8f21c: (-s ours) Merge "DO NOT MERGE - Fixed the order of parameters passing" into lmp-sprout-dev by Daniel Xie · 9 years ago