Commit Graph

458 Commits

Author SHA1 Message Date
JP Abgrall
c8a7ea262a am 9cc068f7: am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit '9cc068f7e50dd6b39e80d5d69d7af895843f3afe':
2015-09-22 20:09:16 +00:00
JP Abgrall
9cc068f7e5 am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit '7e32f6e8c071cea40b4cae9a11d591c052602abe':
2015-09-22 19:59:11 +00:00
JP Abgrall
7e32f6e8c0 am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit '4c38e93e2067c8a0219865c0d5a10f5a66809d8c':
2015-09-22 16:47:02 +00:00
JP Abgrall
4c38e93e20 am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit '740064e97f0e653427a7eb5f99052d9e5a8e27f3':
  Fix CTS build
2015-09-22 03:51:49 +00:00
JP Abgrall
740064e97f am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
  Fix CTS build
2015-09-22 03:45:28 +00:00
Unsuk Jung
55eece280d am 68e1d359: am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
* commit '68e1d359bd55785354656339db30dfd2d75ab7ce':
2015-09-21 21:06:28 +00:00
Unsuk Jung
68e1d359bd am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
* commit '3bbdccc7743a3a7343ad3cc68d37508cab185d0d':
2015-09-21 19:05:53 +00:00
Unsuk Jung
3bbdccc774 am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
* commit 'c06d309115b6af2d4f9bd232acea2d285822290a':
2015-09-21 18:57:28 +00:00
Daniel Xie
5a1c9904b0 am 2a1514dc: am 9c37f4a0: am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
* commit '2a1514dc1ec502125df6af7e30425403ff5a21a4':
2015-09-21 18:42:29 +00:00
Daniel Xie
2a1514dc1e am 9c37f4a0: am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
* commit '9c37f4a07009849ad85fb5d224c2472eb52cf610':
2015-09-21 18:35:13 +00:00
Daniel Xie
9c37f4a070 am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
* commit 'da12f30fa5c7cb6e2cde866dcf586079c7f638fe':
2015-09-21 18:25:33 +00:00
Amith Dsouza
1618c86df1 am 9c112acd: am 51139585: am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '9c112acd0fd36d80a0352d931c0c93be706301c9':
2015-09-20 00:16:18 +00:00
Daniel Xie
e0adef11b6 am c28e00cb: am faa25e50: am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit 'c28e00cb1581e20559243c290b330fb97262b8c0':
2015-09-20 00:16:06 +00:00
Amith Dsouza
9c112acd0f am 51139585: am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '51139585f666479d0b9bbb9a5936c3ce2509f785':
2015-09-18 02:31:33 +00:00
Daniel Xie
c28e00cb15 am faa25e50: am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit 'faa25e50f217a4412b382a113c14ca02d586085c':
2015-09-18 02:31:29 +00:00
Amith Dsouza
51139585f6 am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '1dff01853ff06cc8ad9f198dfbba201dc6ce39db':
2015-09-18 02:19:59 +00:00
Daniel Xie
faa25e50f2 am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit '662de4922d9f7436a806e1ee7eaee75b4096aa48':
2015-09-18 02:19:53 +00:00
Unsuk Jung
c06d309115 am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
* commit 'b640b49e4451dacb5ce181df86b7c662ee50e693':
2015-09-16 16:03:18 +00:00
Daniel Xie
da12f30fa5 am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
* commit 'b4a9fcb132727d49fdfd96c31f71f731ceea7faa':
2015-09-16 16:02:58 +00:00
Unsuk Jung
b640b49e44 am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
* commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3':
2015-09-16 15:56:34 +00:00
Daniel Xie
b4a9fcb132 am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
* commit 'a011f009de12362f1a2b6fc92d2726be646a10f5':
2015-09-16 15:55:18 +00:00
Daniel Xie
1b00fadb5a am 8299c94b: am a8dfc9ac: am aa87b6d1: am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit '8299c94b4346f0511f0e1d5837d1b406e21b5001':
2015-09-15 21:49:19 +00:00
Daniel Xie
8299c94b43 am a8dfc9ac: am aa87b6d1: am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit 'a8dfc9acfe032ac10e398c1e809e61a1b00d26e4':
2015-09-15 21:39:12 +00:00
Amith Dsouza
1dff01853f am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '2d22fa9b07f2db449162c0de894faee288f6d85b':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-09-15 21:33:57 +00:00
Daniel Xie
662de4922d am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit '624951463c7fa9e548ab51a0344bbd485cafc80f':
  Accept more than one SD in NsdManagerTest
2015-09-15 21:33:53 +00:00
Daniel Xie
a8dfc9acfe am aa87b6d1: am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit 'aa87b6d1ce1ae0cc0db88b6a5bee8e857c0803af':
2015-09-15 21:31:04 +00:00
Amith Dsouza
2d22fa9b07 am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '2e4ce593e3b6c611783bc660f95e2e783e004cd3':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-09-15 17:00:13 +00:00
Daniel Xie
624951463c am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2':
  Accept more than one SD in NsdManagerTest
2015-09-15 17:00:07 +00:00
Takayuki Hoshi
17ee86e40a am 6ee31d95: am 4544716d: am 7f9f8b1d: am f8e24166: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit '6ee31d9567b367e562ef615eb30db5be9418e3b0':
2015-09-15 01:17:59 +00:00
Unsuk Jung
10e6377c64 am 24d41777: am 7bc2c817: am f742ea6d: am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit '24d417770b9b241ad97930ee0ececd301e62fd89':
2015-09-15 01:17:12 +00:00
Daniel Xie
affc5b6a52 am db636cae: am 91a9bc2a: am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit 'db636cae9539b9ddc83f066e1c2bd4c61a98deff':
2015-09-15 01:17:05 +00:00
Takayuki Hoshi
6ee31d9567 am 4544716d: am 7f9f8b1d: am f8e24166: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit '4544716d2db7f41209cc6631a7be619326d31497':
2015-09-15 01:07:55 +00:00
Unsuk Jung
24d417770b am 7bc2c817: am f742ea6d: am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit '7bc2c81736e916630397e4b27f8e8d37cb3ec389':
2015-09-15 01:06:47 +00:00
Daniel Xie
db636cae95 am 91a9bc2a: am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '91a9bc2ac2e907be881a4cfabcdef7ed2d8a9445':
2015-09-15 01:06:36 +00:00
Takayuki Hoshi
4544716d2d am 7f9f8b1d: am f8e24166: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit '7f9f8b1dc549df5210dadd9f0805f257e733a331':
2015-09-15 00:52:55 +00:00
Unsuk Jung
7bc2c81736 am f742ea6d: am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'f742ea6d30fde381f6b93776fe247b232edebd74':
2015-09-15 00:50:55 +00:00
Daniel Xie
91a9bc2ac2 am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '67651de7590224c2483d0e574217a0939b5c78bd':
2015-09-15 00:50:33 +00:00
Daniel Xie
aa87b6d1ce am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit 'f4efe32775207f1f47e2ee21686b9a0aed777894':
  Support WiFi only device at runtime.
2015-09-12 06:30:42 +00:00
Takayuki Hoshi
7f9f8b1dc5 am f8e24166: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit 'f8e2416639adea724e0699240cf85d51672db1ee':
2015-09-12 06:26:52 +00:00
Unsuk Jung
f742ea6d30 am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'bfd0aabaa5222173f74915b68a560d098deebc80':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-12 04:08:15 +00:00
Daniel Xie
67651de759 am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '32540663fe6b9982c4542a7371bc5280fdf6ba29':
  Lookup private resources in run-time
2015-09-12 04:07:55 +00:00
Daniel Xie
f4efe32775 am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit 'e260657a086ed507a80e8809315d22495faa15e4':
  Support WiFi only device at runtime.
2015-09-12 00:31:35 +00:00
Daniel Xie
e260657a08 am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit '45643db78515be3603ad2a17244d21badfd89a25':
  Support WiFi only device at runtime.
2015-09-10 18:25:59 +00:00
Takayuki Hoshi
f8e2416639 am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit '2212f189a42be9b52e37a10e8b94d3d07c51e109':
  Normalize ipv6.cts.PingTest#testLoopbackPing's packet size
2015-09-10 04:41:04 +00:00
Unsuk Jung
bfd0aabaa5 am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'b8ad8a1a990597951faaf9e82722e628ff74c0e3':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-10 03:47:23 +00:00
Daniel Xie
32540663fe am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '4ed5d94e1d5d3d4eb12bf7e2318cb6396315f2c1':
  Lookup private resources in run-time
2015-09-10 03:04:49 +00:00
Unsuk Jung
b8ad8a1a99 am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit '17607b8a36287108099db71b9a15f20d64434203':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-09 22:19:06 +00:00
Daniel Xie
4ed5d94e1d am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit 'ee05618ceb115b884afca1f88dfd1beca311fb29':
  Lookup private resources in run-time
2015-09-09 21:48:24 +00:00
Daniel Xie
9417d7288d am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit 'ea9003d9692e1fc1384a02686c3d36f195d9d55e':
  Support WiFi only device at runtime.
2015-08-05 18:28:01 +00:00
Daniel Xie
ea9003d969 am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit '2b44bd54f88a4374ea631994650d464df4d6fe4e':
  Support WiFi only device at runtime.
2015-07-28 18:15:16 +00:00