summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-15Merge "[ITS] Enable non-debug mode to speed up tests." into ↵nougat-mr2-devClemenz Portmann
nougat-mr1-cts-dev am: ea2e8dc705 am: 17b5fda74b am: dc8d4f821f Change-Id: I9849f8b2788972ad3a8b0e4b40b4139b830cee70
2017-02-15Merge "[ITS] Enable non-debug mode to speed up tests." into ↵Clemenz Portmann
nougat-mr1-cts-dev am: ea2e8dc705 am: 17b5fda74b Change-Id: I4322a4cbfff6e579bdd5328b49f0bf5b9907df6d
2017-02-15Merge "[ITS] Enable non-debug mode to speed up tests." into nougat-mr1-cts-devClemenz Portmann
am: ea2e8dc705 Change-Id: I1621ce871237dc55a6c3854adf8c10fac80ee88d
2017-02-15Merge "[ITS] Enable non-debug mode to speed up tests." into nougat-mr1-cts-devTreehugger Robot
2017-02-15Merge "Expanding the list view to be scrollable on watch." into ↵Tina Zhou
nougat-mr1-cts-dev am: a4f3582377 am: 5007a93fe7 am: 9590c33f06 Change-Id: If5dcd8770aff849314040d368d711c693556fa54
2017-02-15Merge "Expanding the list view to be scrollable on watch." into ↵Tina Zhou
nougat-mr1-cts-dev am: a4f3582377 am: 5007a93fe7 Change-Id: I193c2e23f5be6cb2e837a3043d881e294b5e2e48
2017-02-15Merge "Expanding the list view to be scrollable on watch." into ↵Tina Zhou
nougat-mr1-cts-dev am: a4f3582377 Change-Id: I2e082f79d69b33ffbad869a7ea3f225687365df3
2017-02-15Merge "Expanding the list view to be scrollable on watch." into ↵Tina Zhou
nougat-mr1-cts-dev
2017-02-15Merge "DO NOT MERGE Fixing layout of several test suites for round screens." ↵Kane Ho
into nougat-mr1-cts-dev am: baa6894eeb -s ours am: 8c6fde5c85 am: e855fcbc32 Change-Id: I62ab229a75606542a8342d2b120b1195d660a2c2
2017-02-15Merge "DO NOT MERGE Fixing layout of security, sensors & projection in CTS ↵Kane Ho
Verifier." into nougat-mr1-cts-dev am: 2ded8683c7 -s ours am: 683a7684dc am: 03b2f79972 Change-Id: I5b07f5673fe2044c72c17ef5595dbe186bc63721
2017-02-15Merge "Merge "DO NOT MERGE Fixing layout of audio test suite for round ↵Kane Ho
screens." into nougat-mr1-cts-dev am: 9622c61acf -s ours" into nyc-mr1-dev am: 4b3ad40b92 am: 468a429272 Change-Id: If59f0aa9b500ff83706ab00629e58a8305ea23d6
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours am: bade347a62 am: 2964af6683 am: 853fdf4547 am: 51bd2878c1 -s ours am: 5ba6d91e44 am: c8b89de1c8 am: 24c03b95c5 am: e2e1084017 Change-Id: I07bb6954fb18ecd971a3d9e42890709a651df211
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r17" ↵Tina Zhou
into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours am: 51dc6c8192 am: 69f553d842 am: 4f65a8ca94 am: 7a7289f584 Change-Id: Ie6f7a99615af6e7340c020c3599a1e13be62c68b
2017-02-15Merge "DO NOT MERGE Fixing layout of several test suites for round screens." ↵Kane Ho
into nougat-mr1-cts-dev am: baa6894eeb -s ours am: 8c6fde5c85 Change-Id: Iae57d610e20f7b5ae53ea0e6d55427f67955feae
2017-02-15Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours" into nougat-cts-dev am: 754757a802 -s ours am: a8b85df40c am: 8b0d701366 am: 6c367e336f am: dbda33f185 Change-Id: I0f07185ecb5735e37bef3f3135ac67f3110be258
2017-02-15Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to ↵Tina Zhou
5.1_r17" into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours" into nougat-mr1-cts-dev am: 51760401f1 -s ours am: a567d7d79a am: 97e9eab5e6 Change-Id: I1e42c216d3b39661d0c06f4f788da03e9805c396
2017-02-15Merge "DO NOT MERGE Fixing layout of security, sensors & projection in CTS ↵Kane Ho
Verifier." into nougat-mr1-cts-dev am: 2ded8683c7 -s ours am: 683a7684dc Change-Id: Ia38d7ecaa04acb972b7279af642f1815eafecfd7
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" ↵Tina Zhou
into marshmallow-cts-dev am: f074523769 -s ours" into nougat-cts-dev am: 754757a802 -s ours" into nougat-mr1-cts-dev am: 874af4fd55 -s ours am: 8e2ca3c93a am: 8fe94b3b81 Change-Id: Id78546e7de237b57446b58d350ae703c413f870c
2017-02-15Merge "Merge "DO NOT MERGE Fixing layout of audio test suite for round ↵Kane Ho
screens." into nougat-mr1-cts-dev am: 9622c61acf -s ours" into nyc-mr1-dev am: 4b3ad40b92 Change-Id: Ifc069b7c1114daba234089f2c25908abaedf8991
2017-02-15Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into ↵Tina Zhou
nougat-cts-dev am: 9e11570455 -s ours" into nougat-mr1-cts-dev am: 00fbd41f4b -s ours am: 91763bb31a am: 274302320e Change-Id: Ife50779bdf2918d01982eb8581a52c5ca6e3fba5
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours am: bade347a62 am: 2964af6683 am: 853fdf4547 am: 51bd2878c1 -s ours am: 5ba6d91e44 am: c8b89de1c8 am: 24c03b95c5 Change-Id: Ib72f776a844973b9642686bc825e1508a512e365
2017-02-15Merge "DO NOT MERGE Fixing layout of several test suites for round screens." ↵Kane Ho
into nougat-mr1-cts-dev am: baa6894eeb -s ours Change-Id: I2bd4cff60568c6a0857bc6991c9cfede6e4786da
2017-02-15Merge "DO NOT MERGE Fixing layout of security, sensors & projection in CTS ↵Kane Ho
Verifier." into nougat-mr1-cts-dev am: 2ded8683c7 -s ours Change-Id: I45ae9aab5b7e49718cf8385c1c18a218383934fc
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r17" ↵Tina Zhou
into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours am: 51dc6c8192 am: 69f553d842 am: 4f65a8ca94 Change-Id: I3a9d857acd4a7683c7cfac51ef5c1b2878fc1d1a
2017-02-15Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours" into nougat-cts-dev am: 754757a802 -s ours am: a8b85df40c am: 8b0d701366 am: 6c367e336f Change-Id: I5193fd5e468982f215cb7597d30a4c394b2bc3d8
2017-02-15Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to ↵Tina Zhou
5.1_r17" into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours" into nougat-mr1-cts-dev am: 51760401f1 -s ours am: a567d7d79a Change-Id: I2bc418fe15854bc19135ac281de47072e8fcc992
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" ↵Tina Zhou
into marshmallow-cts-dev am: f074523769 -s ours" into nougat-cts-dev am: 754757a802 -s ours" into nougat-mr1-cts-dev am: 874af4fd55 -s ours am: 8e2ca3c93a Change-Id: Ic9f5732fe7ff2fce59c610795121fe0e666d533b
2017-02-15Merge "Merge "DO NOT MERGE Fixing layout of audio test suite for round ↵Android Build Merger (Role)
screens." into nougat-mr1-cts-dev am: 9622c61acf -s ours" into nyc-mr1-dev
2017-02-15Merge "DO NOT MERGE Fixing layout of audio test suite for round screens." ↵Kane Ho
into nougat-mr1-cts-dev am: 9622c61acf -s ours Change-Id: I2ad0668cb5c5fe97dd13fba42036dc27ffa8ce8a
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours am: bade347a62 am: 2964af6683 am: 853fdf4547 am: 51bd2878c1 -s ours am: 5ba6d91e44 am: c8b89de1c8 Change-Id: Icfbae84aaa7e485fd24bf2cca3aac28b856a625e
2017-02-15Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into ↵Tina Zhou
nougat-cts-dev am: 9e11570455 -s ours" into nougat-mr1-cts-dev am: 00fbd41f4b -s ours am: 91763bb31a Change-Id: Iabf098e90a89a9653644f9f24a0a2fb954443e14
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r17" ↵Tina Zhou
into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours am: 51dc6c8192 am: 69f553d842 Change-Id: I5cdab238e5f7028684977499e29d8a9d960db0e4
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours am: bade347a62 am: 2964af6683 am: 853fdf4547 am: 51bd2878c1 -s ours am: 5ba6d91e44 Change-Id: I06ad64137dab43a2256fb1f836bde54cb7f09775
2017-02-15Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours" into nougat-cts-dev am: 754757a802 -s ours am: a8b85df40c am: 8b0d701366 Change-Id: I5f9233706d9e29639b0b4fdae4d092f1243244b7
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into ↵Tina Zhou
nougat-cts-dev am: 9e11570455 -s ours am: d4063c31a9 am: 4b1ae43b0c am: ede92dfde7 am: 9532a4c440 Change-Id: I9fcec8c397200a42aa443c024359331fe177999e
2017-02-15Merge "DO NOT MERGE Fixing layout of several test suites for round screens." ↵Treehugger Robot
into nougat-mr1-cts-dev
2017-02-15Merge "DO NOT MERGE Fixing layout of security, sensors & projection in CTS ↵Treehugger Robot
Verifier." into nougat-mr1-cts-dev
2017-02-15Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to ↵Tina Zhou
5.1_r17" into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours" into nougat-mr1-cts-dev am: 51760401f1 -s ours Change-Id: I15d75904105f7ed3b191b2554612fcfc7471fcb4
2017-02-15Merge "DO NOT MERGE Fixing layout of audio test suite for round screens." ↵Treehugger Robot
into nougat-mr1-cts-dev
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" ↵Tina Zhou
into marshmallow-cts-dev am: f074523769 -s ours" into nougat-cts-dev am: 754757a802 -s ours" into nougat-mr1-cts-dev am: 874af4fd55 -s ours Change-Id: I2ccd94d4fb5ed0189a1404d2ae105e7a74f084c5
2017-02-15Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into ↵Tina Zhou
nougat-cts-dev am: 9e11570455 -s ours" into nougat-mr1-cts-dev am: 00fbd41f4b -s ours Change-Id: I5105864d037c729ae94ee4e55e89aeedab706a90
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours am: bade347a62 am: 2964af6683 am: 853fdf4547 am: 51bd2878c1 -s ours Change-Id: I995d17e8f18ac084eaa1f8ba9733b7083f6a5190
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r17" ↵Tina Zhou
into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours am: 51dc6c8192 Change-Id: If44f34985d2e07fc48fcda66d23ca7d6118ecacc
2017-02-15Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours" into nougat-cts-dev am: 754757a802 -s ours am: a8b85df40c Change-Id: I1d997a51096a9aa5e186198c112584e31a39b363
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into ↵Tina Zhou
nougat-cts-dev am: 9e11570455 -s ours am: d4063c31a9 am: 4b1ae43b0c am: ede92dfde7 Change-Id: I1590e706ce39ccfc44707ce27ad7eff1972a6f16
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours am: bade347a62 am: 2964af6683 am: 853fdf4547 Change-Id: I3e0dc8f3366a7f948a887dc8927d3d3556350b78
2017-02-15Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r17" ↵Tina Zhou
into lollipop-mr1-cts-dev am: 9bb9e26289 -s ours" into marshmallow-cts-dev am: 49830a662e -s ours" into nougat-cts-dev am: 86081dfe9f -s ours Change-Id: I5f7f037d0550f8ca5fef46ded788dc8ff18fd285
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into ↵Tina Zhou
nougat-cts-dev am: 9e11570455 -s ours am: d4063c31a9 am: 4b1ae43b0c Change-Id: I545abc30f9196eb3761485f0b25d94c1ea09839a
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r3" into ↵Tina Zhou
nougat-mr1-cts-dev am: c5c34a2dad -s ours am: c290506e7c am: 4880349f17 Change-Id: I7f0eca14d59fdf9d616974a8a3640d0d89341aaf
2017-02-15Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r16" into ↵Tina Zhou
marshmallow-cts-dev am: f074523769 -s ours am: bade347a62 am: 2964af6683 Change-Id: I7096c0a352b9507447cd01252e084d06e0462f89
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 22:09:47 +0000