Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
cts
/
89c469017559fc073ee64400c7c82e6c2a2c3008
89c4690
Merge "migrate device policy tests to cts_v2"
by Nash Lincoln
· 9 years ago
afa857b
migrate device policy tests to cts_v2
by Nash Lincoln
· 9 years ago
9624eb2
Merge "migrate security tests to cts_v2"
by Nash Lincoln
· 9 years ago
50a03a5
Merge "migrate host atrace tests to cts_v2"
by Nash Lincoln
· 9 years ago
19a17c9
migrate host atrace tests to cts_v2
by Nash Lincoln
· 9 years ago
d78105b
Merge "CTS test for layer drawable intrinsic size"
by Alan Viverette
· 9 years ago
bb24b37
Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf am: 289f4fb50d am: 5e166a117b am: 296437ee05
by Nicholas Sauer
· 9 years ago
3428089
Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf am: 289f4fb50d am: 5e166a117b
by Nicholas Sauer
· 9 years ago
296437e
Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf am: 289f4fb50d
by Nicholas Sauer
· 9 years ago
5e166a1
Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf
by Nicholas Sauer
· 9 years ago
289f4fb
Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c
by Nicholas Sauer
· 9 years ago
73fdcf2
Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev
by Nicholas Sauer
· 9 years ago
ca29aea
Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev
by Nicholas Sauer
· 9 years ago
224beac
Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52 am: 989dc34697 am: eba9aacf98 am: 817ddc6bea
by Nicholas Sauer
· 9 years ago
8f0e99b
Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52 am: 989dc34697 am: eba9aacf98
by Nicholas Sauer
· 9 years ago
817ddc6
Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52 am: 989dc34697
by Nicholas Sauer
· 9 years ago
eba9aac
Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52
by Nicholas Sauer
· 9 years ago
989dc34
Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65
by Nicholas Sauer
· 9 years ago
889cea6
Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65
by Nicholas Sauer
· 9 years ago
4318078
Merge "Add reference url to XML reports" into marshmallow-cts-dev
by Nicholas Sauer
· 9 years ago
a9fd3bc
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd am: acb962ebda am: 9e6fe47d73 am: 5539eb9114
by Daniel Xie
· 9 years ago
1eed645
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd am: acb962ebda am: 9e6fe47d73
by Daniel Xie
· 9 years ago
5539eb9
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd am: acb962ebda
by Daniel Xie
· 9 years ago
9e6fe47
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd
by Daniel Xie
· 9 years ago
acb962e
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours
by Daniel Xie
· 9 years ago
3322c28
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1
by Daniel Xie
· 9 years ago
6e5f6e2
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58
by Daniel Xie
· 9 years ago
90bbb96
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours
by Daniel Xie
· 9 years ago
cfdcba2
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev
by Daniel Xie
· 9 years ago
842be8f
Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev
by Daniel Xie
· 9 years ago
5b0df2c
DO NOT MERGE: fixed breakages
by Daniel Xie
· 9 years ago
f29768c
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e am: 03fd9a1c84 am: cf2efdc4b1 am: 0734080364
by Daniel Xie
· 9 years ago
3de7490
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a am: 2d4a2aba7f am: 5a8b3770fa am: 4fb2316950
by Natalie Silvanovich
· 9 years ago
7212580
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e am: 03fd9a1c84 am: cf2efdc4b1
by Daniel Xie
· 9 years ago
0734080
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e am: 03fd9a1c84
by Daniel Xie
· 9 years ago
cf2efdc
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e
by Daniel Xie
· 9 years ago
03fd9a1
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours
by Daniel Xie
· 9 years ago
e179f15
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e
by Daniel Xie
· 9 years ago
3e5dbaf
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7
by Daniel Xie
· 9 years ago
fbe5db8
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours
by Daniel Xie
· 9 years ago
d6dc24d
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev
by Daniel Xie
· 9 years ago
0d61990
Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev
by Daniel Xie
· 9 years ago
b15e4eb
DO NOT MERGE: disable
by Daniel Xie
· 9 years ago
5a5a2bb
Add reference url to XML reports
by Nicholas Sauer
· 9 years ago
14b6f3c
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a am: 2d4a2aba7f am: 5a8b3770fa
by Natalie Silvanovich
· 9 years ago
4fb2316
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a am: 2d4a2aba7f
by Natalie Silvanovich
· 9 years ago
5a8b377
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a
by Natalie Silvanovich
· 9 years ago
2d4a2ab
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec
by Natalie Silvanovich
· 9 years ago
d0ad091
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737
by Natalie Silvanovich
· 9 years ago
bc884dc
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e
by Natalie Silvanovich
· 9 years ago
ddff8ff
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665
by Natalie Silvanovich
· 9 years ago
b677598
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746
by Natalie Silvanovich
· 9 years ago
3afc0fa
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659
by Natalie Silvanovich
· 9 years ago
4a350f5
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1
by Natalie Silvanovich
· 9 years ago
490c486
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829
by Natalie Silvanovich
· 9 years ago
85c2298
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev
by Natalie Silvanovich
· 9 years ago
d87db0f
Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev
by Natalie Silvanovich
· 9 years ago
a213cdf
Merge "Add reference url to XML reports"
by Nicholas Sauer
· 9 years ago
56a88e2
Merge "ContentView is Deprecated."
by Julia Reynolds
· 9 years ago
9ff761e
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8 am: fb0f421bf6 am: 0030ee1e93 am: 9056e7d19f
by Daniel Xie
· 9 years ago
1ad89b3
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8 am: fb0f421bf6 am: 0030ee1e93
by Daniel Xie
· 9 years ago
8775573
resolve merge conflicts of 7409b6b063 to master.
by Colin Cross
· 9 years ago
9056e7d
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8 am: fb0f421bf6
by Daniel Xie
· 9 years ago
0030ee1
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8
by Daniel Xie
· 9 years ago
fb0f421
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours
by Daniel Xie
· 9 years ago
7409b6b
resolve merge conflicts of 6c36a34462 to stage-aosp-master. am: 08afb0cd9d
by Colin Cross
· 9 years ago
1ce9ab4
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c
by Daniel Xie
· 9 years ago
49226d0
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5
by Daniel Xie
· 9 years ago
c5372ed
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours
by Daniel Xie
· 9 years ago
08afb0c
resolve merge conflicts of 6c36a34462 to stage-aosp-master.
by Colin Cross
· 9 years ago
19cf4d6
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev
by Daniel Xie
· 9 years ago
2620baf
Add reference url to XML reports
by Nicholas Sauer
· 9 years ago
78ba3c4
Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev
by Daniel Xie
· 9 years ago
3cf33b6
Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"
by Daniel Xie
· 9 years ago
6c36a34
Merge "cts: prevent unnecessary rebuilds"
by Colin Cross
· 9 years ago
5f127e2
cts: prevent unnecessary rebuilds
by Colin Cross
· 9 years ago
4e43c5d
Merge "Add tests for Property, IntProperty, FloatProperty"
by Chet Haase
· 9 years ago
fec5378
Merge "CTS tests for Condition Providers."
by Julia Reynolds
· 9 years ago
ae11033
CTS tests for Condition Providers.
by Julia Reynolds
· 9 years ago
43a37f6
Merge "Only output tests that aren't suppressed."
by Stuart Scott
· 9 years ago
f09636a
Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6 am: 742e61bc84 am: 0596890e0b am: 17f3c1e172
by Daniel Xie
· 9 years ago
b1cb72f
Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64 am: 02f95411b8 am: c6c85b9210 am: 97630989fb
by Daniel Xie
· 9 years ago
6f6eb96
Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours am: dc932f3208 am: fd4715567d am: 355cbae7c9 am: c4e55b55d4
by Daniel Xie
· 9 years ago
f91d38c
Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours am: d837fd83a6 am: 543d7125fb am: f1cd94133f am: 605631e0da
by Daniel Xie
· 9 years ago
1f1cc63
Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours am: 458b1752c2 am: 19cb8b2857 am: 0c5eeca02c am: ab9aba9b0e
by Daniel Xie
· 9 years ago
f443042
Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours am: 72b71f5fa1 am: 39fe30960d am: 5aad947a8a am: 24dc651472
by Daniel Xie
· 9 years ago
7fb8c57
Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6 am: 742e61bc84 am: 0596890e0b
by Daniel Xie
· 9 years ago
4fa61dd
Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64 am: 02f95411b8 am: c6c85b9210
by Daniel Xie
· 9 years ago
e7763ba
Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours am: dc932f3208 am: fd4715567d am: 355cbae7c9
by Daniel Xie
· 9 years ago
d819b79
Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours am: d837fd83a6 am: 543d7125fb am: f1cd94133f
by Daniel Xie
· 9 years ago
43d7d95
Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours am: 458b1752c2 am: 19cb8b2857 am: 0c5eeca02c
by Daniel Xie
· 9 years ago
272a76d
Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours am: 72b71f5fa1 am: 39fe30960d am: 5aad947a8a
by Daniel Xie
· 9 years ago
17f3c1e
Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6 am: 742e61bc84
by Daniel Xie
· 9 years ago
9763098
Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64 am: 02f95411b8
by Daniel Xie
· 9 years ago
c4e55b5
Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours am: dc932f3208 am: fd4715567d
by Daniel Xie
· 9 years ago
605631e
Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours am: d837fd83a6 am: 543d7125fb
by Daniel Xie
· 9 years ago
ab9aba9
Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours am: 458b1752c2 am: 19cb8b2857
by Daniel Xie
· 9 years ago
24dc651
Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours am: 72b71f5fa1 am: 39fe30960d
by Daniel Xie
· 9 years ago
0596890
Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6
by Daniel Xie
· 9 years ago
c6c85b92
Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64
by Daniel Xie
· 9 years ago
Next »