The Android Automerger
|
405ea20fb8
|
am 8f97b6c6: am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '8f97b6c65c11b8757d3d77ab861317e2b077504d':
|
2015-10-06 00:23:20 +00:00 |
|
The Android Automerger
|
8f97b6c65c
|
am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '8a8372c7c93b84078db52093043f6962ac7ccd64':
|
2015-10-06 00:17:55 +00:00 |
|
The Android Automerger
|
8a8372c7c9
|
am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '3dfca9d879b75e7be77dc7f19e79200f787dc975':
|
2015-10-06 00:11:15 +00:00 |
|
The Android Automerger
|
3dfca9d879
|
am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '78df332ef1a6be3cda40b776a6321425fa829ddb':
|
2015-10-06 00:01:46 +00:00 |
|
Paul Jensen
|
22e42b48f5
|
resolved conflicts for 3e4042eb to mnc-dev
Change-Id: I3476d55641288b21a1609a8e72f37012d86bad03
|
2015-09-25 07:28:26 -04:00 |
|
Paul Jensen
|
3e4042eb78
|
am 063f9718: am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '063f971859d0ef5ac96b69de345cd94fd4788b7e':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
|
2015-09-25 11:09:06 +00:00 |
|
Paul Jensen
|
063f971859
|
am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '358b4b140f9811667471596293fc1f5cfa2d536c':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
|
2015-09-25 11:02:47 +00:00 |
|
Paul Jensen
|
358b4b140f
|
am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '8c04baef4cb8066712c6b1af345781b41a17aa8a':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
|
2015-09-25 10:57:05 +00:00 |
|
Paul Jensen
|
8c04baef4c
|
am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit 'e287a5c6d87bfc86ca83fc886cd00b8b8e221022':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
|
2015-09-25 10:51:01 +00:00 |
|
Paul Jensen
|
e287a5c6d8
|
Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
|
2015-09-25 10:45:39 +00:00 |
|
The Android Automerger
|
78df332ef1
|
merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
|
2015-09-24 07:26:50 -07:00 |
|
Daniel Xie
|
981e10712e
|
am 4755b246: am 30ee954e: am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
* commit '4755b246fe6ff0668a894dee2c060d757f473299':
|
2015-09-22 20:22:15 +00:00 |
|
JP Abgrall
|
2b43f49116
|
am c8a7ea26: am 9cc068f7: am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit 'c8a7ea262a8cff7d555df7a02db3143c426a331f':
|
2015-09-22 20:20:59 +00:00 |
|
Daniel Xie
|
4755b246fe
|
am 30ee954e: am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
* commit '30ee954ec2aa1293c9a465dabe234624f1140a5e':
|
2015-09-22 20:10:19 +00:00 |
|
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 |
|
Daniel Xie
|
30ee954ec2
|
am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
* commit 'f056ab504b47e56616689df10e8d89277f09e447':
|
2015-09-22 20:01:21 +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 |
|
Daniel Xie
|
f056ab504b
|
am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
* commit 'f5c48b8e6f92717d82b2478bcaf685c67953ad98':
|
2015-09-22 16:48:46 +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 |
|
Paul Jensen
|
45984684aa
|
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
Bug:21900139
Change-Id: Ib026bc4e66437f015729bdf7c923145ffa41fbde
|
2015-09-22 08:07:46 -04:00 |
|
Daniel Xie
|
f5c48b8e6f
|
am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
* commit '760b6d86ca79029a2a97ca81c97caee035e72cb1':
|
2015-09-22 03:52:55 +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 |
|
Daniel Xie
|
760b6d86ca
|
am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':
|
2015-09-22 03:46:53 +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
|
285f632cba
|
am 55eece28: 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 '55eece280d28a87034eaf2d6b4b9d15cbf9f82e9':
|
2015-09-21 21:30:43 +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
|
f7142c13eb
|
am 5a1c9904: am 2a1514dc: am 9c37f4a0: am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
* commit '5a1c9904b0dd18fa801e68da5f91dd3247056407':
|
2015-09-21 18:51:13 +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
|
31ed5fc6a4
|
am 1618c86d: am 9c112acd: am 51139585: am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '1618c86df16352478a23a5868fb53beb561c3394':
|
2015-09-20 01:36:00 +00:00 |
|
Daniel Xie
|
d781d8a61d
|
am e0adef11: am c28e00cb: am faa25e50: am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit 'e0adef11b63a3c50341e98f0c21b60d7f36b3d5f':
|
2015-09-20 01:35:56 +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
|
024ce01bc6
|
am 1b00fadb: 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 '1b00fadb5a0e22f7a724df167d3e1fa0d6a1c953':
|
2015-09-15 23:59:36 +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 |
|