Commit Graph

31750 Commits

Author SHA1 Message Date
Andreas Huber
1c1e87cfd5 Merge "Use the same http proxy mechanism that webkit uses instead of bypassing proxies." 2011-03-09 14:42:12 -08:00
Robert Ly
83c400fb05 am 2a36cf42: doc change: removing references to eclipse 3.4
* commit '2a36cf42fa6f941b2a55f7f391d79b93b8f780f4':
  doc change: removing references to eclipse 3.4
2011-03-09 14:39:55 -08:00
Mathias Agopian
f56f3d7dc9 am 176e7108: am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
* commit '176e71081b17787652c778cd115e079199dac536':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
2011-03-09 14:36:05 -08:00
Stephen Hines
2175fbddee am 67eab1e9: am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
* commit '67eab1e9cd9a7bfb1a32492cdaa6f52bf470e11d':
  Fix a race condition during Context init/teardown.
2011-03-09 14:35:55 -08:00
Mathias Agopian
68dd07d845 am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
* commit '838aa45b99f504596971063003fa8a75e89e4c41':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
2011-03-09 14:32:47 -08:00
Stephen Hines
88cc428236 am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
* commit 'c8a4b11e1f752b901610472039f981f97a65aae6':
  Fix a race condition during Context init/teardown.
2011-03-09 14:32:44 -08:00
Mathias Agopian
9bc46ccbdc Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1 2011-03-09 14:30:16 -08:00
Stephen Hines
83a10cb3aa Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1 2011-03-09 14:29:57 -08:00
Leon Scroggins
6599081fc7 am e1413a9e: am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
* commit 'e1413a9e9cdb2dd2792d318542db483b188276c8':
  Scroll textfield onscreen when the IME shows.
2011-03-09 14:25:10 -08:00
Leon Scroggins
400b50cdf8 am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
* commit '23c5861cde7efef568fa3c61e0f1fa4fe97c7cfa':
  Scroll textfield onscreen when the IME shows.
2011-03-09 14:22:50 -08:00
Leon Scroggins
6d78bf0e1c Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1 2011-03-09 14:21:17 -08:00
Huahui Wu
7cba49b2e6 am 45e5db99: am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
* commit '45e5db99979d9f85e7c3cad3e750b886e3abb105':
  b/3307761 Clean up the flag mIsHandlingMultiTouch.
2011-03-09 14:07:20 -08:00
Huahui Wu
8ddf712098 am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
* commit '166b190efc35b7ddad6b011ba537c177e88a2336':
  b/3307761 Clean up the flag mIsHandlingMultiTouch.
2011-03-09 14:04:52 -08:00
Huahui Wu
89381d2df3 Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1 2011-03-09 13:55:35 -08:00
Ed Heyl
d625d10792 am cc7d3c53: am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
* commit 'cc7d3c539abd4affd5e95cff8740d9303deac63d':
  UsbManager: Fix broken Javadoc links
2011-03-09 13:06:36 -08:00
Ed Heyl
20a46fc8e9 am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
* commit 'b22bb1dae1213fe9383020a53eeb89de40e7bbd0':
  UsbManager: Fix broken Javadoc links
2011-03-09 12:56:17 -08:00
Ed Heyl
97fe840e61 Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1 2011-03-09 12:53:38 -08:00
Eric Laurent
1158bdafdc am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
* commit '2dc78477364bd4accb9a603baaafca9a5523dcec':
  Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 11:00:22 -08:00
Eric Laurent
9d43fc8dde am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
* commit 'cc34967fdcbf64826a068901d6fb1bd8bb1fa99f':
  Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 10:57:49 -08:00
Eric Laurent
0708bdbda4 Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 2011-03-09 10:56:01 -08:00
Shimeng (Simon) Wang
dc2b11d2d3 am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
* commit '246b2b313cb545da9d6f791b90d5a1cc4316114e':
  Consider mInitialScale when setting min zoom scale.
2011-03-09 10:53:44 -08:00
Shimeng (Simon) Wang
50bfd60603 am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
  Consider mInitialScale when setting min zoom scale.
2011-03-09 10:51:26 -08:00
Mike Lockwood
6f57ec5c09 am 094c9900: am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '094c9900de383f0934f74cedef0d24b6d8a14905':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:51:16 -08:00
Shimeng (Simon) Wang
e720a884e9 Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1 2011-03-09 10:48:57 -08:00
Mike Lockwood
36b89fe39e am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '2c3ed82600af117e791a087330a198fe90d298b7':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:48:13 -08:00
Mike Lockwood
8890a546d8 Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1 2011-03-09 10:44:19 -08:00
Andreas Huber
2fbb4e4c4c Merge "An HTTP datasource for stagefright using the chromium code." 2011-03-09 10:37:20 -08:00
Jean-Michel Trivi
1dc2bb9165 am 8d0e2b98: am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
* commit '8d0e2b9857e5f77ced233dc408a7acd9e8ab2e8c':
  Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:22:56 -08:00
Jean-Michel Trivi
6d0fc1cd0d am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
* commit '5fa7aac81b471557cd944f762340281e5fa012f9':
  Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:20:24 -08:00
Jean-Michel Trivi
33ab4fc951 Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1 2011-03-09 10:18:31 -08:00
David Li
c95e452508 Merge "Added screenshot after glDraw* option to GLES2 Debugger" 2011-03-09 10:05:38 -08:00
David Li
c7ec152b9d Merge "Initial commit of GLESv2 debugger server" 2011-03-09 10:04:46 -08:00
Wink Saville
c740f330c0 Merge "Telephony: Corrections to LTE and eHRPD constant values." 2011-03-09 09:48:05 -08:00
Irfan Sheriff
85f50a626a am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
  Persist wifi override in airplane mode
2011-03-09 09:36:40 -08:00
Irfan Sheriff
d99cd79768 am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode
2011-03-09 09:32:55 -08:00
Irfan Sheriff
1d24d7f7ce Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -08:00
Patrick Scott
8dda66214f am 5d534f28: am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit '5d534f288d0c29337458e267fd207236bc23fec5':
  Pass the auto login header information to the app.
2011-03-09 05:10:34 -08:00
Patrick Scott
8ae27d926f am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
  Pass the auto login header information to the app.
2011-03-09 05:08:15 -08:00
Patrick Scott
95d38acf8b Merge "Pass the auto login header information to the app." into honeycomb-mr1 2011-03-09 05:05:21 -08:00
Bjorn Bringert
1d47d4fe25 Merge "Exception handling clean-up in TextToSpeech.java" 2011-03-09 04:38:08 -08:00
Kristian Monsen
bfb7c4ba79 am b4ca8b76: am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit 'b4ca8b7696ea8559fced8bcdf36e11ed28785c7c':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:34:31 -08:00
Kristian Monsen
d706d1eff0 am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit '9e697ee9fc9dcc21348d799e1e0bc83dd3abdb18':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:32:28 -08:00
Kristian Monsen
8e947862d5 Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 2011-03-09 04:29:45 -08:00
Mike Lockwood
d1d5ac154c am 093cf07f: am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '093cf07f3c58a6553c415d750edba1a75b269f05':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:57:14 -08:00
Mike Lockwood
c92343ddde am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:54:28 -08:00
Mike Lockwood
298ecf5fdf Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* changes:
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:52:47 -08:00
Jeff Brown
859364c2ca am 1baae5c9: (-s ours) am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
* commit '1baae5c9b635f8672a8f0b8d83f23d5b9ec72297':
  Eliminate some accidental log spam.  (DO NOT MERGE)
2011-03-09 02:51:45 -08:00
Jeff Brown
8b0512713b am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
* commit '36b077d558727ead246434b08de0ce7b955508e1':
  Eliminate some accidental log spam.  (DO NOT MERGE)
2011-03-09 02:48:18 -08:00
Jeff Brown
9caa9da162 Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 02:45:59 -08:00
Adam Powell
c986abfe12 am 529eb76b: am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
* commit '529eb76b8add903c67ecf0178b6b4603edd64ebb':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:28:29 -08:00