OSDN Git Service

android-x86/frameworks-native.git
13 years agoam aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
Xavier Ducrohet [Mon, 11 Jul 2011 19:46:07 +0000 (12:46 -0700)]
am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.

* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
  Merge 36a3a392 from mr1.

13 years agoam d292d2a0: Merge 36a3a392 from mr1.
Xavier Ducrohet [Mon, 11 Jul 2011 19:43:15 +0000 (12:43 -0700)]
am d292d2a0: Merge 36a3a392 from mr1.

* commit 'd292d2a03134eaca8b51b6313610b4b78de53c83':
  Merge 36a3a392 from mr1.

13 years agoam 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into...
Chia-chi Yeh [Mon, 11 Jul 2011 17:29:32 +0000 (10:29 -0700)]
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.

13 years agoMerge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
Chia-chi Yeh [Mon, 11 Jul 2011 17:25:28 +0000 (10:25 -0700)]
Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE

13 years agoam 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed"...
Wink Saville [Mon, 11 Jul 2011 02:35:14 +0000 (19:35 -0700)]
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

13 years agoMerge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
Wink Saville [Mon, 11 Jul 2011 02:33:54 +0000 (19:33 -0700)]
Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE

13 years agoam 89799e72: Fix incorrect ERI banner format
Kazuhiro Ondo [Mon, 11 Jul 2011 00:21:52 +0000 (17:21 -0700)]
am 89799e72: Fix incorrect ERI banner format

* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
  Fix incorrect ERI banner format

13 years agoam 64ba5eaa: Concurrent multi-PDP support in TrafficStats
Kazuhiro Ondo [Sun, 10 Jul 2011 23:16:54 +0000 (16:16 -0700)]
am 64ba5eaa: Concurrent multi-PDP support in TrafficStats

* commit '64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
  Concurrent multi-PDP support in TrafficStats

13 years agoVpnService: stop VPN when unknown DNS servers show up.
Chia-chi Yeh [Sat, 9 Jul 2011 00:59:54 +0000 (17:59 -0700)]
VpnService: stop VPN when unknown DNS servers show up.

Bug: 5002601
Change-Id: I5459db009e7391ff874623cb1830065ac75c80ed

13 years agoam 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68...
Robert Ly [Fri, 8 Jul 2011 17:44:10 +0000 (10:44 -0700)]
am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2

* commit '6b98e7128b3fbfd8b2c421286c403e4609c69708':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052

13 years agoam 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into...
Joe Malin [Fri, 8 Jul 2011 17:41:54 +0000 (10:41 -0700)]
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

13 years agoam 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d7...
Joe Fernandez [Fri, 8 Jul 2011 17:41:35 +0000 (10:41 -0700)]
am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2

* commit '20f6520197a6b70123d2ff7c466ee58349ae3032':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c

13 years agoam 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba...
Robert Ly [Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)]
am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2

* commit '3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052

13 years agoMerge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052...
Robert Ly [Fri, 8 Jul 2011 17:13:28 +0000 (10:13 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2

13 years agoam 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeyco...
Wink Saville [Fri, 8 Jul 2011 16:40:11 +0000 (09:40 -0700)]
am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE

* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
  Disconnect ApnContexts in INITING state when error.

13 years agoam 8171e6f6: Use resetConnections with resetMask.
Wink Saville [Fri, 8 Jul 2011 16:40:08 +0000 (09:40 -0700)]
am 8171e6f6: Use resetConnections with resetMask.

* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.

13 years agoam 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000....
Wink Saville [Fri, 8 Jul 2011 16:40:03 +0000 (09:40 -0700)]
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.

13 years agoam 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
Joe Malin [Fri, 8 Jul 2011 16:39:25 +0000 (09:39 -0700)]
am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2

* commit '0e89d916f078a518093c476725fa7e0798dcc590':
  DOC CHANGE: Change GTV info on intro page

13 years agoam 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec...
Joe Fernandez [Fri, 8 Jul 2011 16:39:22 +0000 (09:39 -0700)]
am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2

* commit '0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c

13 years agoMerge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
Wink Saville [Fri, 8 Jul 2011 05:00:56 +0000 (22:00 -0700)]
Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE

13 years agoMerge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
Joe Malin [Fri, 8 Jul 2011 01:19:18 +0000 (18:19 -0700)]
Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2

13 years agoMerge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c...
Joe Fernandez [Thu, 7 Jul 2011 22:03:55 +0000 (15:03 -0700)]
Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2

13 years agoMerge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
Wink Saville [Thu, 7 Jul 2011 21:39:23 +0000 (14:39 -0700)]
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE

13 years agoam e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0f...
Scott Main [Thu, 7 Jul 2011 17:17:00 +0000 (10:17 -0700)]
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

13 years agoam 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27...
Scott Main [Thu, 7 Jul 2011 17:14:38 +0000 (10:14 -0700)]
am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards

* commit '0657e1a7e7d25fee700930252f6b85c3d70bc368':
  cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards

13 years agoam 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs...
Scott Main [Thu, 7 Jul 2011 17:13:44 +0000 (10:13 -0700)]
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

13 years agoam 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs...
Scott Main [Thu, 7 Jul 2011 17:10:29 +0000 (10:10 -0700)]
am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards

* commit '77dfe2173e2970a6a662b7d9537715c81886185e':
  cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards

13 years agoam 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers...
Wink Saville [Thu, 7 Jul 2011 02:05:40 +0000 (19:05 -0700)]
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

13 years agoMerge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
Wink Saville [Thu, 7 Jul 2011 02:04:30 +0000 (19:04 -0700)]
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE

13 years agoam 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4...
Robert Ly [Thu, 7 Jul 2011 01:19:26 +0000 (18:19 -0700)]
am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8

* commit '027654e90da14275fbf076e739e16f89c4fcae2c':
  cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8

13 years agoam ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b...
Robert Ly [Thu, 7 Jul 2011 01:17:53 +0000 (18:17 -0700)]
am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8

* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5':
  cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8

13 years agoam c8e2916d: Bring back ERI into CDMA-LTE mode
Kazuhiro Ondo [Thu, 7 Jul 2011 01:04:30 +0000 (18:04 -0700)]
am c8e2916d: Bring back ERI into CDMA-LTE mode

* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
  Bring back ERI into CDMA-LTE mode

13 years agoam 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
Wink Saville [Wed, 6 Jul 2011 19:09:48 +0000 (12:09 -0700)]
am 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE

* commit '97667d0cb3d5aecca7210c70a302f7a667330708':
  Allow vril-dump to work on user builds

13 years agoMerge "Allow vril-dump to work on user builds" into honeycomb-LTE
Wink Saville [Wed, 6 Jul 2011 19:08:05 +0000 (12:08 -0700)]
Merge "Allow vril-dump to work on user builds" into honeycomb-LTE

13 years agoam bc45fcbb: am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change...
Robert Ly [Wed, 6 Jul 2011 18:26:27 +0000 (11:26 -0700)]
am bc45fcbb: am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0

* commit 'bc45fcbb44fb6af0e99446c0e56eba8238de9e90':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0

13 years agoam 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea4924...
Robert Ly [Wed, 6 Jul 2011 18:22:20 +0000 (11:22 -0700)]
am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0

* commit '205d1c34e3289b05700e6caab718de169ad82b90':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0

13 years agoam 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache...
Robert Greenwalt [Wed, 6 Jul 2011 14:48:21 +0000 (07:48 -0700)]
am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"

* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
  Added methods to support dns cache per interface

13 years agoam 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"
Robert Greenwalt [Wed, 6 Jul 2011 14:42:19 +0000 (07:42 -0700)]
am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"

* commit '2b62c4fbfeb7df0988bf216c50cd4a24f05add9f':
  Added methods to support dns cache per interface

13 years agoam 38bb0123: Merge "Added methods to support dns cache per interface"
Robert Greenwalt [Wed, 6 Jul 2011 14:35:02 +0000 (07:35 -0700)]
am 38bb0123: Merge "Added methods to support dns cache per interface"

* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface

13 years agoMerge "Added methods to support dns cache per interface"
Robert Greenwalt [Fri, 1 Jul 2011 16:26:50 +0000 (09:26 -0700)]
Merge "Added methods to support dns cache per interface"

13 years agoam 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
Kazuhiro Ondo [Fri, 1 Jul 2011 01:00:06 +0000 (18:00 -0700)]
am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting

* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
  DataConnection was cleaned up too early if it's already disconnecting

13 years agoam a2267451: Don\'t ever report a null ServiceState
Robert Greenwalt [Thu, 30 Jun 2011 21:50:32 +0000 (14:50 -0700)]
am a2267451: Don\'t ever report a null ServiceState

* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
  Don't ever report a null ServiceState

13 years agoam 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple...
Conley Owens [Thu, 30 Jun 2011 15:25:13 +0000 (08:25 -0700)]
am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

* commit '98395483e4309f7b92348136491575861008b3c0':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.

13 years agoam 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifica...
Conley Owens [Thu, 30 Jun 2011 15:22:10 +0000 (08:22 -0700)]
am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

* commit '9f2cbf14f8d79e6ed48ff9d76f6aaede45185418':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.

13 years agoam e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
Conley Owens [Thu, 30 Jun 2011 15:19:00 +0000 (08:19 -0700)]
am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

* commit 'e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.

13 years agoMerge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
Conley Owens [Thu, 30 Jun 2011 15:11:25 +0000 (08:11 -0700)]
Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

13 years agoam f3f9967e: Make sure to update data availability in call setup capable triggers.
Kazuhiro Ondo [Thu, 30 Jun 2011 00:24:56 +0000 (17:24 -0700)]
am f3f9967e: Make sure to update data availability in call setup capable triggers.

* commit 'f3f9967e22201276d65f4be6006aca1cecc2a604':
  Make sure to update data availability in call setup capable triggers.

13 years agoam dbcc57c6: Fix dependencyMet issues regarding hipri APN.
Robert Greenwalt [Wed, 29 Jun 2011 22:22:50 +0000 (15:22 -0700)]
am dbcc57c6: Fix dependencyMet issues regarding hipri APN.

* commit 'dbcc57c6f1602da324609ddbaf76f836504733ae':
  Fix dependencyMet issues regarding hipri APN.

13 years agoam d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a...
Scott Main [Wed, 29 Jun 2011 03:57:40 +0000 (20:57 -0700)]
am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

* commit 'd3cc051dcb05a32eba1c208792e1bde4654a6db3':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

13 years agoam a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e...
Scott Main [Wed, 29 Jun 2011 03:50:12 +0000 (20:50 -0700)]
am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

* commit 'a687045045157eab2dbf657bb085cb0af68d72f2':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

13 years agoam 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from...
Xavier Ducrohet [Wed, 29 Jun 2011 02:14:05 +0000 (19:14 -0700)]
am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread

* commit '842725fc642b7ba2c087cc81796973b838c23c76':
  Bring in more layout lib changes from hc-mr1.

13 years agoam 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not...
Xavier Ducrohet [Wed, 29 Jun 2011 01:58:09 +0000 (18:58 -0700)]
am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
  CherryPick 06942bc4 from hc-mr1. do not merge.

13 years agoam 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not...
Xavier Ducrohet [Wed, 29 Jun 2011 01:56:17 +0000 (18:56 -0700)]
am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
  CherryPick 988eeeb5 from hc-mr1. do not merge.

13 years agoam e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some versio...
Xavier Ducrohet [Wed, 29 Jun 2011 01:56:14 +0000 (18:56 -0700)]
am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread

* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
  DO NOT MERGE. may fix build on some version of gcc

13 years agoam 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:55:46 +0000 (18:55 -0700)]
am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread

* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
  Bring in more layout lib changes from hc-mr1.

13 years agoam 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:55:42 +0000 (18:55 -0700)]
am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.

13 years agoam 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:53:54 +0000 (18:53 -0700)]
am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
  CherryPick 988eeeb5 from hc-mr1. do not merge.

13 years agoam 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:53:51 +0000 (18:53 -0700)]
am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread

* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
  DO NOT MERGE. may fix build on some version of gcc

13 years agoMerge "Bring in more layout lib changes from hc-mr1." into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:53:15 +0000 (18:53 -0700)]
Merge "Bring in more layout lib changes from hc-mr1." into gingerbread

13 years agoMerge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:53:06 +0000 (18:53 -0700)]
Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

13 years agoMerge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:52:59 +0000 (18:52 -0700)]
Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

13 years agoMerge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:52:43 +0000 (18:52 -0700)]
Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread

13 years agoam af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events.
mike wakerly [Wed, 29 Jun 2011 00:22:53 +0000 (17:22 -0700)]
am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events.

* commit 'af08ddbc42fb51de76958d859cf0e87d0b9e475e':
  Add intent actions for new firmware events.

13 years agoam 2f9ad8b4: Add intent actions for new firmware events.
mike wakerly [Wed, 29 Jun 2011 00:19:05 +0000 (17:19 -0700)]
am 2f9ad8b4: Add intent actions for new firmware events.

* commit '2f9ad8b499cb150d5cdfe84a9795992c5dd42cff':
  Add intent actions for new firmware events.

13 years agoam 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing...
Wink Saville [Tue, 28 Jun 2011 02:57:20 +0000 (19:57 -0700)]
am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE

* commit '29d1dde972acaaf3685b60de3da00c1809c510f9':
  Data connection retry pattern could be broken by PDP sharing

13 years agoMerge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
Wink Saville [Tue, 28 Jun 2011 02:54:27 +0000 (19:54 -0700)]
Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE

13 years agoam 351ddeb2: am 5db9ff97: Update final 13 API def.
Dianne Hackborn [Tue, 28 Jun 2011 00:11:15 +0000 (17:11 -0700)]
am 351ddeb2: am 5db9ff97: Update final 13 API def.

* commit '351ddeb2da65fc020e80d77d80f08aa1dfd820d7':
  Update final 13 API def.

13 years agoam 5db9ff97: Update final 13 API def.
Dianne Hackborn [Tue, 28 Jun 2011 00:07:29 +0000 (17:07 -0700)]
am 5db9ff97: Update final 13 API def.

* commit '5db9ff97aa8f36f330f41f5ae42467795ef075b8':
  Update final 13 API def.

13 years agoam 0711c86c: am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
Robert Ly [Mon, 27 Jun 2011 18:58:26 +0000 (11:58 -0700)]
am 0711c86c: am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2

* commit '0711c86c3886fe869216965b868d30e9bb3abcea':
  docs: fixing new superscript for rs

13 years agoam 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
Robert Ly [Mon, 27 Jun 2011 18:49:30 +0000 (11:49 -0700)]
am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2

* commit '81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
  docs: fixing new superscript for rs

13 years agoMerge "docs: fixing new superscript for rs" into honeycomb-mr2
Robert Ly [Mon, 27 Jun 2011 18:45:41 +0000 (11:45 -0700)]
Merge "docs: fixing new superscript for rs" into honeycomb-mr2

13 years agoam 3ba39ef2: am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
Anirudh Dewani [Mon, 27 Jun 2011 11:33:59 +0000 (04:33 -0700)]
am 3ba39ef2: am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2

* commit '3ba39ef20fdbe4512d3c3ad6ad7c833b14318391':
  Typo in spinner tutorial.

13 years agoam 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
Anirudh Dewani [Mon, 27 Jun 2011 06:06:04 +0000 (23:06 -0700)]
am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2

* commit '1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
  Typo in spinner tutorial.

13 years agoMerge "Typo in spinner tutorial." into honeycomb-mr2
Anirudh Dewani [Mon, 27 Jun 2011 06:02:56 +0000 (23:02 -0700)]
Merge "Typo in spinner tutorial." into honeycomb-mr2

13 years agoam fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeyc...
Dianne Hackborn [Fri, 24 Jun 2011 19:43:44 +0000 (12:43 -0700)]
am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE.  Fix density compat mode." into honeycomb-mr2

* commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249':
  DO NOT MERGE.  Fix density compat mode.

13 years agoam 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
Dianne Hackborn [Fri, 24 Jun 2011 19:26:17 +0000 (12:26 -0700)]
am 2dafe771: Merge "DO NOT MERGE.  Fix density compat mode." into honeycomb-mr2

* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
  DO NOT MERGE.  Fix density compat mode.

13 years agoam 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support...
Jean-Baptiste Queru [Fri, 24 Jun 2011 19:20:24 +0000 (12:20 -0700)]
am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
  Add WEBP to the list of Image formats that support Compression.

13 years agoam 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility"
Jean-Baptiste Queru [Fri, 24 Jun 2011 19:20:10 +0000 (12:20 -0700)]
am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility"

* commit '7595e84d3a60d2a63990703043a8e9647f71e3a4':
  Tweak for forward-compatibility

13 years agoMerge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
Dianne Hackborn [Fri, 24 Jun 2011 19:13:16 +0000 (12:13 -0700)]
Merge "DO NOT MERGE.  Fix density compat mode." into honeycomb-mr2

13 years agoam 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:33:46 +0000 (11:33 -0700)]
am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
  Add WEBP to the list of Image formats that support Compression.

13 years agoam f458d5fd: Merge "Tweak for forward-compatibility"
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:28:30 +0000 (11:28 -0700)]
am f458d5fd: Merge "Tweak for forward-compatibility"

* commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
  Tweak for forward-compatibility

13 years agoMerge "Add WEBP to the list of Image formats that support Compression."
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:13:42 +0000 (11:13 -0700)]
Merge "Add WEBP to the list of Image formats that support Compression."

13 years agoMerge "Tweak for forward-compatibility"
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:08:36 +0000 (11:08 -0700)]
Merge "Tweak for forward-compatibility"

13 years agoTweak for forward-compatibility
Jean-Baptiste Queru [Fri, 24 Jun 2011 17:49:18 +0000 (10:49 -0700)]
Tweak for forward-compatibility

Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d

13 years agoam f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into...
Wink Saville [Fri, 24 Jun 2011 01:25:38 +0000 (18:25 -0700)]
am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE

* commit 'f49e4d3f182071081537dba3387db20cae27c427':
  Temporary re-enabling iface name change handling on HO

13 years agoMerge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
Wink Saville [Fri, 24 Jun 2011 01:21:36 +0000 (18:21 -0700)]
Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE

13 years agoam f169bae8: am f8d37ab6: Merge "docs: add emphasis to adding a search button in...
Scott Main [Thu, 23 Jun 2011 20:15:58 +0000 (13:15 -0700)]
am f169bae8: am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2

* commit 'f169bae87df61ad91bda0c547a59fdaeda1bed10':
  docs: add emphasis to adding a search button in activity UI

13 years agoam f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI"...
Scott Main [Thu, 23 Jun 2011 20:12:30 +0000 (13:12 -0700)]
am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2

* commit 'f8d37ab6b35c6cdd44e833ae4bd65301f2d3543a':
  docs: add emphasis to adding a search button in activity UI

13 years agoMerge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
Scott Main [Thu, 23 Jun 2011 20:08:27 +0000 (13:08 -0700)]
Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2

13 years agoam db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and...
Scott Main [Thu, 23 Jun 2011 19:51:49 +0000 (12:51 -0700)]
am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers

* commit 'db76388e9af0019842ea2cca0b14d11f2e146d1a':
  docs: update docs for new screen support attributes and qualifiers

13 years agoam 9a05cfe5: docs: update docs for new screen support attributes and qualifiers
Scott Main [Thu, 23 Jun 2011 19:26:33 +0000 (12:26 -0700)]
am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers

* commit '9a05cfe5427a6cee988333e0d65f17b9854554a3':
  docs: update docs for new screen support attributes and qualifiers

13 years agoam a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
Scott Main [Thu, 23 Jun 2011 16:32:58 +0000 (09:32 -0700)]
am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2

* commit 'a602972c3fbb6a4f115b2cfe95b30fd10572fcb3':
  docs: add Lenevo driver info

13 years agoam 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
Scott Main [Thu, 23 Jun 2011 16:28:34 +0000 (09:28 -0700)]
am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2

* commit '1acd2a7f2b263e9d8de23a0d5630d77efe370c80':
  docs: add Lenevo driver info

13 years agoMerge "docs: add Lenevo driver info" into honeycomb-mr2
Scott Main [Thu, 23 Jun 2011 16:18:22 +0000 (09:18 -0700)]
Merge "docs: add Lenevo driver info" into honeycomb-mr2

13 years agoam 1d6ffd73: Merge "Restrict access to protected networks." into honeycomb-LTE
Robert Greenwalt [Thu, 23 Jun 2011 15:19:48 +0000 (08:19 -0700)]
am 1d6ffd73: Merge "Restrict access to protected networks." into honeycomb-LTE

* commit '1d6ffd7339c3dfa53de19e27ca09e57233cc25ef':
  Restrict access to protected networks.

13 years agoMerge "Restrict access to protected networks." into honeycomb-LTE
Robert Greenwalt [Thu, 23 Jun 2011 15:04:48 +0000 (08:04 -0700)]
Merge "Restrict access to protected networks." into honeycomb-LTE

13 years agoam dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should...
Scott Main [Thu, 23 Jun 2011 01:13:03 +0000 (18:13 -0700)]
am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2

* commit 'dc0ae0cb9752c6d6150593da2dccf39abbe6b095':
  docs: add info about manifest attributes that should not change

13 years agoam 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
Raphael Moll [Thu, 23 Jun 2011 01:05:22 +0000 (18:05 -0700)]
am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."

* commit '2b5f2d01558ba338042f486c754f63873c4061fe':
  Laoutlib_creator: keep original of delegate methods.

13 years agoam 138836ad: Merge "docs: add info about manifest attributes that should not change...
Scott Main [Thu, 23 Jun 2011 00:53:12 +0000 (17:53 -0700)]
am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2

* commit '138836adc7e28e66984fdc20d22688d4da561c15':
  docs: add info about manifest attributes that should not change

13 years agoMerge "docs: add info about manifest attributes that should not change" into honeycom...
Scott Main [Thu, 23 Jun 2011 00:45:13 +0000 (17:45 -0700)]
Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2