Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / cts / 0906a6e8d0f5993e5a0fb4dd65df0f5ff94ac36a
  1. 0906a6e Fix merge conflict resolution in e8eded12e2d66c59b8ccb950867d447be67bfb68 by Brian Carlstrom · 9 years ago
  2. ef15134 Merge "Use default theme for test activities" into mnc-dev by Alice Lee · 9 years ago
  3. 360c7e1 Use default theme for test activities by Alice Lee · 9 years ago
  4. ddc8611 am 86842fa7: (-s ours) am dfea6a1f: am 6f9b657c: am 3b59ea03: am dd429123: am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  5. 86842fa am dfea6a1f: am 6f9b657c: am 3b59ea03: am dd429123: am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  6. dfea6a1 am 6f9b657c: am 3b59ea03: am dd429123: am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  7. 6f9b657 am 3b59ea03: am dd429123: am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  8. 3b59ea0 am dd429123: am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  9. dd42912 am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  10. 7378587 am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  11. a638771 am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  12. 391a9b9 am 7ea0e3de: am e4b7a091: am 9a99de67: Merge "BUG: 23954202 fixed minimum memory to be 1099" into lmp-mr1-dev by Daniel Xie · 9 years ago
  13. eee7494 am 08c19d37: (-s ours) am d50e8dde: (-s ours) am 3f84453c: (-s ours) am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  14. 7ea0e3d am e4b7a091: am 9a99de67: Merge "BUG: 23954202 fixed minimum memory to be 1099" into lmp-mr1-dev by Daniel Xie · 9 years ago
  15. e039c05 am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  16. e8eded1 resolved conflicts for 4c7fd94a to mnc-dev by Daniel Xie · 9 years ago
  17. e4b7a09 am 9a99de67: Merge "BUG: 23954202 fixed minimum memory to be 1099" into lmp-mr1-dev by Daniel Xie · 9 years ago
  18. 885182d Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  19. 9a99de6 Merge "BUG: 23954202 fixed minimum memory to be 1099" into lmp-mr1-dev by Daniel Xie · 9 years ago
  20. b0a3558 BUG: 23954202 fixed minimum memory to be 1099 by Daniel Xie · 9 years ago
  21. 08c19d3 am d50e8dde: (-s ours) am 3f84453c: (-s ours) am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  22. 4c7fd94a am 4e5cc1c8: resolved conflicts for 12aba5ff to lmp-mr1-app-dev by Daniel Xie · 9 years ago
  23. d50e8dd am 3f84453c: (-s ours) am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  24. 4e5cc1c resolved conflicts for 12aba5ff to lmp-mr1-app-dev by Daniel Xie · 9 years ago
  25. 3f84453 am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  26. fc19d13 am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  27. eaba159 DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  28. 12aba5f DO NOT MERGE: fix breakage by Daniel Xie · 9 years ago
  29. 41c30ae am aa76577c: am bdea8d23: am 15c76237: am 6a8db850: am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  30. aa76577 am bdea8d23: am 15c76237: am 6a8db850: am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  31. bdea8d2 am 15c76237: am 6a8db850: am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  32. 15c7623 am 6a8db850: am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  33. 6a8db85 am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  34. 54c452f am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  35. 1cf21ab am 492536cd: (-s ours) am 3dad896f: (-s ours) am ff397e62: (-s ours) am cc40c023: (-s ours) am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev by Robert Shih · 9 years ago
  36. 4fca7a5 am d1c3be52: am c4b4f5f1: am 379468d3: resolved conflicts for 07831126 to lmp-mr1-dev by Daniel Xie · 9 years ago
  37. 12f72fc am ac3885ad: (-s ours) am bcc58bf4: am 8229b21d: am b7da0b8c: am 05447533: am 104f4316: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-cts-dev by Daniel Xie · 9 years ago
  38. e8e3e72 am 57f44a27: (-s ours) am 8b8da044: am d73116ba: am a9f632ee: am 40629641: am 9e7c72c0: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours automerge: af857be -s ours automerge: by Nicholas Sauer · 9 years ago
  39. c3cc7b9 am ed478294: am 3df162c4: am 880d1d1c: am 18ea82b0: am 3b885659: am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev by Chien-Yu Chen · 9 years ago
  40. 051555e am 7b9674c0: am b078b024: am c369e54a: am 66a3c178: am 4f300dd8: am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours by Daniel Xie · 9 years ago
  41. 98bc555 am 0c180693: am 5c2cafaa: am aca0540b: am b63011af: am 9aa565e2: am db124f73: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152 by Nicholas Sauer · 9 years ago
  42. 72240a2 am 4eb97748: (-s ours) am 4ce553d2: (-s ours) am eb0d7931: (-s ours) am 703266a4: (-s ours) am 6b7071ff: (-s ours) am d7b36097: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  43. d0ad0a0 am 8059f876: am 39482cfa: am 19a41464: am 6cfe86ad: am 41f66cec: am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev by Kenny Guy · 9 years ago
  44. 1aa32da am 1e9f4570: am deddc5d9: am 735a5d42: am 89b888b6: am 2a6218d2: am e7918277: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev by Daniel Xie · 9 years ago
  45. c0eb685 am 5322db57: am 5dbe7eb9: am b990a22c: am c5372027: am b545ddfd: am 72dc4bc7: Merge "Send broadcasts to the CTS Robot even if it is stopped." into lollipop-cts-dev by Daniel Xie · 9 years ago
  46. b7741b8 am 2f896bf1: (-s ours) am efc9d381: am 8644b3d8: am 550ba396: am 4c53fed0: am f24c7e3a: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours by Daniel Xie · 9 years ago
  47. 4acf678 am 4820d873: am 0cfa0932: am 8d5bd4c0: resolved conflicts for 15c7e068 to lmp-mr1-dev by Daniel Xie · 9 years ago
  48. 80d7e4a am 5bd93aed: (-s ours) am 25c13314: am eff5baa6: DO NOT MERGE: resolved conflicts for 85a6998e to lmp-mr1-dev by Daniel Xie · 9 years ago
  49. f13c6f1 am 19d089ae: am d920df01: am d7e29d74: am c9c6452f: am 2f560e8b: am 85cd818f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 by Daniel Xie · 9 years ago
  50. 7191a2d am ec34cbdf: am 841856c4: am 2769a771: am f88b62bc: am 8f997fb6: am 1712bffb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e by Daniel Xie · 9 years ago
  51. b6219ed am 52f1b6c5: am 63049dce: am afb0b2ff: am 8c40edcd: am 236a3bb7: am 60a61108: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c by Daniel Xie · 9 years ago
  52. 3b9594a am 9e30a9cc: am b8d8ab53: am 4c4c2359: am af323b36: am 1ce4e788: am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours by Daniel Xie · 9 years ago
  53. 739ec4b am 1e22ed85: am ba5b06f2: am 73f22c64: am 0e91df78: am 7a6b05b0: am 6ec683d9: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 by Daniel Xie · 9 years ago
  54. 4052f09 am 07f43bac: am d3135a77: am f3f1e77d: am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours by Daniel Xie · 9 years ago
  55. 6a7a897 am 7be08fbd: am ce5e6ca9: am a403e7b6: am e72c11ad: am 1044110e: am f1fac19a: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 by Daniel Xie · 9 years ago
  56. af7a9ea am 447d7825: am efdfc651: am 88a44614: am b1b162a8: am 8781d0d9: am a1eb3bfe: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93 -s ours by Daniel Xie · 9 years ago
  57. 5eaa51b am f2f3b301: am f9ed3357: am c0c712fb: am 13ccb595: am 99c8f777: am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours by Daniel Xie · 9 years ago
  58. 6cf0ec5 am 01173cb8: am 7acc9e66: am 201ba877: am 56d5cd90: am 02c406cf: am 8c948271: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4 -s ours by Daniel Xie · 9 years ago
  59. 86f0d80 am 15a337f3: am b259be08: am 9eb6f348: am 477644b8: am 240c397b: am e0e957af: Merge "Modify user agent CTS test to (optionally) match new webview user agent." into lollipop-cts-dev by Gustav Sennton · 9 years ago
  60. ddb1f6f am 385aff27: (-s ours) am 16845326: am f8bae557: am db4c4b40: am 39b31294: am fdfa9769: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev by Daniel Xie · 9 years ago
  61. a4fd046 am 3ca5628e: am f43a1577: am 076a77bf: am 247fa4ba: am a79f552d: am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev by Daniel Xie · 9 years ago
  62. 4ae2205 am 0299546d: am 1bf25b48: am 8937f196: am 955f4d4e: am 0ab8f2e3: am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev by Daniel Xie · 9 years ago
  63. 937ef8e am 268beed2: am 204828b7: am a18febd4: am 55f3df10: am 4db526ff: am d4a695ab: Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev by Daniel Xie · 9 years ago
  64. 2bdac14 am 586cc47b: am f4903c25: am 4396661e: am fe025c64: am b61b387c: am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  65. 3063a56 am 1b1fa21d: am 17d1fcd7: am addebe63: am 6fa1ea7d: am 949baa53: am 0d8dcd5d: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 by Daniel Xie · 9 years ago
  66. 1e40ced am 8b669c38: am e7cdef2b: am 2ccd3e06: am 46b2a3f2: am 6d5089b2: am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev by Daniel Xie · 9 years ago
  67. 56a40df am b97f8033: am 4b740326: am 0931d0ab: am 98cefc3d: am e961b09b: am 37581fa5: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd automerge: 675f1cc by Daniel Xie · 9 years ago
  68. 59b4c14 am f8da4ca6: am 5e7165c0: am a39fb369: am 669cd99b: am 42c295fb: am d8302648: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb -s ours by Daniel Xie · 9 years ago
  69. 169720f am cba5b802: am c357576c: am 1cf2f830: am 79de3186: am e954f691: am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f by Yin-Chia Yeh · 9 years ago
  70. 745603b am 70ac3d1d: am b7d528c5: am c750ae1a: am 18ff08ff: am 1922f133: am 424644fc: Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev automerge: 1f6e28c -s ours by Yin-Chia Yeh · 9 years ago
  71. 6013e4b am 73a91a17: am 4aeb772e: am 5bd89711: am 40d0ac25: am 27e476b3: am ef8b550c: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 3323726 by Yin-Chia Yeh · 9 years ago
  72. ebb571a am 548c7761: am 00e9fb1e: am d944510f: am 079c1249: am d8aae7a8: am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 by Daniel Xie · 9 years ago
  73. 4373177 am 3a52865c: am cfdac039: am aee0d930: am 2844f093: am 6f42f69a: am 557dddb4: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev automerge: b5b05ae by Daniel Xie · 9 years ago
  74. af044b1 am ee17937a: am b7ab146f: am f8a816b5: am 8ff9c63e: am b740dd12: am a9bb8ed5: Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev automerge: 72893be -s ours by Daniel Xie · 9 years ago
  75. 69d4894 am 827a6e3d: am cfb702c4: am 107f06fd: am e730759f: am f813d99e: am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  76. ccd2993 am f2d26716: am 0d97114f: am fba233bd: am 33ad8700: am 1ae833fb: am fde9054e: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 automerge: 76c8e3d by Daniel Xie · 9 years ago
  77. cf39683 am ed1e3353: am 8ddf96da: am 740d1a4c: am 40a4bbea: am 67a98163: am e866e410: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 automerge: 1aa503c by Daniel Xie · 9 years ago
  78. 5a7845a am 02ddfd0e: am dbbe8cf0: am 0fce02ed: am a0b6ce93: am 57d56240: am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev by JP Abgrall · 9 years ago
  79. c4ea145 am ab2878a1: am 3036e276: am c1cc1574: am 5e28d329: am 7cf4f71f: am 74338c1e: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev automerge: de56635 by Daniel Xie · 9 years ago
  80. a4a5497 am 74ab3dee: am 456a3cd9: am 160699b4: am c393d23e: am 2e80d597: am 9948dea3: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution bigger than ***X400. This is hardcode in t by Daniel Xie · 9 years ago
  81. aa2503c am 40bbe34a: am 7fce0a78: am 2679e70f: am 320ffd89: am 8a6889c5: am aac28857: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 automerge: c73d8 by Daniel Xie · 9 years ago
  82. 2b01987 am 7c177381: (-s ours) am a76ed9b1: am 8d5253e6: am 2c0a5ca5: am cfca25f4: am 906578cc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf -s ours by Daniel Xie · 9 years ago
  83. 2557511 am 1001a2eb: am 7c7bc46e: am d81ee05f: am 242e7188: am 335d8fd9: am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac by Daniel Xie · 9 years ago
  84. 4761213 am 169a11f2: am 719e9e6a: am 91e96275: am 824283d1: am cbcf8b89: am dcdb68d6: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032ac7 automerge: 3efc0e5 by Daniel Xie · 9 years ago
  85. 1aaf9fc am fb053119: (-s ours) am 6038c48b: (-s ours) am 64b45509: (-s ours) DO NOT MERGE ANYWHERE: Merge commit \'7679e48230a3b2ddb530c6626825fd7bd854bd24\' into manual_merge_7679e482 by Daniel Xie · 9 years ago
  86. 24a0917 am a5a75ba8: (-s ours) am c780fceb: am 5f6ed7e2: am 476f1d7e: am eda58024: am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  87. 82ab7d2 am 151a56b4: am b567892a: am f94cafa6: am 015cad1f: am b97ebb80: resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  88. 733361a am 0bc740c5: am 5382b13f: am 57fd059e: am c26d5738: am 471bb6bc: am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 by Daniel Xie · 9 years ago
  89. 41545ec am 3c718ad3: am 86d5e8ae: am 94de36bf: am 3989d10d: am bc49b46d: am 39e0e012: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours by Daniel Xie · 9 years ago
  90. 3a2a7d8 am 0286316b: am e22e33ae: am 9f94d81e: am 172fd5ee: am 8ab546e3: am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours by Daniel Xie · 9 years ago
  91. 9e45aaa am b470f709: am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours by Daniel Xie · 9 years ago
  92. 62e03d3 am 65b3c308: am 03b912f2: am e9589df0: am ce43fc90: am 70111464: am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 by Daniel Xie · 9 years ago
  93. 48ce68f am af7a3d40: am d3473957: am fcbbb20d: am b414e3bd: am 38c555e6: am 44fed250: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours by Daniel Xie · 9 years ago
  94. 99481d5 am 2a831729: am 006c727c: am a09dbb84: am 3493b1c2: am e1d462e3: am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e by Daniel Xie · 9 years ago
  95. 586fb41 Merge "Should return true if the specified file doesn't exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  96. 492536c am 3dad896f: (-s ours) am ff397e62: (-s ours) am cc40c023: (-s ours) am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev by Robert Shih · 9 years ago
  97. d1c3be5 am c4b4f5f1: am 379468d3: resolved conflicts for 07831126 to lmp-mr1-dev by Daniel Xie · 9 years ago
  98. ac3885a am bcc58bf4: am 8229b21d: am b7da0b8c: am 05447533: am 104f4316: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-cts-dev by Daniel Xie · 9 years ago
  99. 57f44a2 am 8b8da044: am d73116ba: am a9f632ee: am 40629641: am 9e7c72c0: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours automerge: af857be -s ours automerge: 350853a -s o by Nicholas Sauer · 9 years ago
  100. ed47829 am 3df162c4: am 880d1d1c: am 18ea82b0: am 3b885659: am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev by Chien-Yu Chen · 9 years ago