Wink Saville
|
a411e3d108
|
Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
|
2011-07-13 14:15:19 -07:00 |
|
Jaikumar Ganesh
|
a4994b2c1d
|
resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
|
2011-07-13 12:29:57 -07:00 |
|
Jaikumar Ganesh
|
99a444e731
|
am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '9ff89495a4890191a0bc5dfddf28f23f79f23698':
Bluetooth: correcting return value from cancelDiscovery
|
2011-07-13 10:25:27 -07:00 |
|
Jaikumar Ganesh
|
04b363802f
|
am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
Bluetooth: correcting return value from cancelDiscovery
|
2011-07-13 10:22:40 -07:00 |
|
John Wang
|
edcceea8c3
|
am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1':
Add getImei() to Phone interface.
|
2011-07-13 10:21:38 -07:00 |
|
John Wang
|
a94755393f
|
Merge "Add getImei() to Phone interface." into honeycomb-LTE
|
2011-07-13 10:17:22 -07:00 |
|
Jaikumar Ganesh
|
95c15bacf5
|
Merge "Bluetooth: correcting return value from cancelDiscovery"
|
2011-07-13 10:04:19 -07:00 |
|
David 'Digit' Turner
|
f22259c533
|
am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
* commit 'db4c5f352d6eb8e248953ccff1dbecb1270af4c5':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
|
2011-07-11 16:15:27 -07:00 |
|
Scott Main
|
748e3ae359
|
am bc047bb0: am e32c49ab: docs: de-new sidenavs
* commit 'bc047bb03e6084ded47ffd5d810045ca973d54e5':
docs: de-new sidenavs
|
2011-07-11 16:08:27 -07:00 |
|
Scott Main
|
f33e6fad66
|
am e32c49ab: docs: de-new sidenavs
* commit 'e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
docs: de-new sidenavs
|
2011-07-11 16:06:25 -07:00 |
|
Robert Ly
|
663ca47710
|
am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '1e4cf2dddbac4d357731ffaf02c4402426aa3763':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
|
2011-07-11 16:05:40 -07:00 |
|
Robert Ly
|
4af3d984ba
|
am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '10a36020e3d37ef088f5f7ed6d64ba35847fc069':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
|
2011-07-11 16:03:30 -07:00 |
|
David 'Digit' Turner
|
3b7791c73e
|
resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
|
2011-07-12 00:57:09 +02:00 |
|
Scott Main
|
eb1bf2d3cd
|
am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard
* commit '56a085c98801d9c4b08cbf398d8225b6761816ac':
docs: fix date on opengl dashboard
|
2011-07-11 15:53:09 -07:00 |
|
Scott Main
|
3d652d4b1a
|
am d3fa7bd1: docs: fix date on opengl dashboard
* commit 'd3fa7bd1e873d885f00b11bb8123284357ccd362':
docs: fix date on opengl dashboard
|
2011-07-11 15:50:16 -07:00 |
|
Xavier Ducrohet
|
1e477a0fb4
|
am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
Merge 36a3a392 from mr1.
|
2011-07-11 12:46:07 -07:00 |
|
Xavier Ducrohet
|
6ec5f34691
|
am d292d2a0: Merge 36a3a392 from mr1.
* commit 'd292d2a03134eaca8b51b6313610b4b78de53c83':
Merge 36a3a392 from mr1.
|
2011-07-11 12:43:15 -07:00 |
|
Nick Pelly
|
407c94a147
|
Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
|
2011-07-11 11:07:22 -07:00 |
|
Chia-chi Yeh
|
839c088761
|
am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2':
VpnService: stop VPN when unknown DNS servers show up.
|
2011-07-11 10:29:32 -07:00 |
|
Chia-chi Yeh
|
ebf0d2dd56
|
Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
|
2011-07-11 10:25:28 -07:00 |
|
Wink Saville
|
94c52b7b90
|
am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
Add a property so that CSIM provision check can be bypassed
|
2011-07-10 19:35:14 -07:00 |
|
Wink Saville
|
8498b8681f
|
Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
|
2011-07-10 19:33:54 -07:00 |
|
Kazuhiro Ondo
|
532017726e
|
am 89799e72: Fix incorrect ERI banner format
* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
Fix incorrect ERI banner format
|
2011-07-10 17:21:52 -07:00 |
|
Kazuhiro Ondo
|
64bc0f2680
|
am 64ba5eaa: Concurrent multi-PDP support in TrafficStats
* commit '64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
Concurrent multi-PDP support in TrafficStats
|
2011-07-10 16:16:54 -07:00 |
|
Chia-chi Yeh
|
fa1bb594cc
|
VpnService: stop VPN when unknown DNS servers show up.
Bug: 5002601
Change-Id: I5459db009e7391ff874623cb1830065ac75c80ed
|
2011-07-08 17:59:54 -07:00 |
|
Robert Ly
|
5e40a8e9f4
|
am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '6b98e7128b3fbfd8b2c421286c403e4609c69708':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
|
2011-07-08 10:44:10 -07:00 |
|
Joe Malin
|
83d7414c9e
|
am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '230ef98728f3b59a81f55dab5129aa50d5f27969':
DOC CHANGE: Change GTV info on intro page
|
2011-07-08 10:41:54 -07:00 |
|
Joe Fernandez
|
1a1c333424
|
am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '20f6520197a6b70123d2ff7c466ee58349ae3032':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
|
2011-07-08 10:41:35 -07:00 |
|
Robert Ly
|
b30faa2e11
|
am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
|
2011-07-08 10:39:46 -07:00 |
|
Robert Ly
|
9186b53da7
|
Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
|
2011-07-08 10:13:28 -07:00 |
|
Wink Saville
|
68843705a5
|
am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
Disconnect ApnContexts in INITING state when error.
|
2011-07-08 09:40:11 -07:00 |
|
Wink Saville
|
aebd78e148
|
am 8171e6f6: Use resetConnections with resetMask.
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
Use resetConnections with resetMask.
|
2011-07-08 09:40:08 -07:00 |
|
Wink Saville
|
4dcbd934fc
|
am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
|
2011-07-08 09:40:03 -07:00 |
|
Joe Malin
|
1c6e2aa5e5
|
am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '0e89d916f078a518093c476725fa7e0798dcc590':
DOC CHANGE: Change GTV info on intro page
|
2011-07-08 09:39:25 -07:00 |
|
Joe Fernandez
|
104a2351c7
|
am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
|
2011-07-08 09:39:22 -07:00 |
|
David 'Digit' Turner
|
c6818784e7
|
merge intel x86 patches into gingerbread branch
|
2011-07-08 18:19:01 +02:00 |
|
Wink Saville
|
f983682b36
|
Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
|
2011-07-07 22:00:56 -07:00 |
|
Joe Malin
|
19798c7586
|
Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
|
2011-07-07 18:19:18 -07:00 |
|
Joe Fernandez
|
36ff879a92
|
Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
|
2011-07-07 15:03:55 -07:00 |
|
Wink Saville
|
206637af68
|
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
|
2011-07-07 14:39:23 -07:00 |
|
Scott Main
|
e06423e154
|
am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit 'e4e1c3fda937d30c9aa75a43c470de6c54a97073':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
|
2011-07-07 10:17:00 -07:00 |
|
Scott Main
|
da26247235
|
am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '0657e1a7e7d25fee700930252f6b85c3d70bc368':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
|
2011-07-07 10:14:38 -07:00 |
|
Scott Main
|
a307ced08a
|
am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '40afb97c3289cd3daae9a31f4829d660ba747d37':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
|
2011-07-07 10:13:44 -07:00 |
|
Scott Main
|
1c4d16f1bc
|
am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '77dfe2173e2970a6a662b7d9537715c81886185e':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
|
2011-07-07 10:10:29 -07:00 |
|
Wink Saville
|
516dec3c9f
|
am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
Reset FAILED ApnContext state to IDLE on data setup triggers
|
2011-07-06 19:05:40 -07:00 |
|
Wink Saville
|
8c05bdcdbc
|
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
|
2011-07-06 19:04:30 -07:00 |
|
Bruce Beare
|
d4c2668298
|
Fix missing NL
Orig-Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
|
2011-07-07 03:45:59 +02:00 |
|
Robert Ly
|
054f597fa8
|
am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '027654e90da14275fbf076e739e16f89c4fcae2c':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
|
2011-07-06 18:19:26 -07:00 |
|
Robert Ly
|
3e02d13040
|
am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
|
2011-07-06 18:17:53 -07:00 |
|
Kazuhiro Ondo
|
927ed58ff7
|
am c8e2916d: Bring back ERI into CDMA-LTE mode
* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
Bring back ERI into CDMA-LTE mode
|
2011-07-06 18:04:30 -07:00 |
|