The Android Open Source Project
92677d978d
am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master
2010-05-12 12:16:45 -07:00
The Android Open Source Project
fc7eccf5fd
am 55bef14f: am fb234bbe: merge from open-source master
2010-05-12 12:15:35 -07:00
The Android Open Source Project
e4582835f0
am fb234bbe: merge from open-source master
...
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken
* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
Notify user regarding invalid number during MO call.
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
Fix glReadPixels() to verify that both x and y are non-negative.
2010-05-12 12:13:18 -07:00
The Android Open Source Project
c77a20a9d6
merge from open-source master
...
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
2010-05-12 11:58:14 -07:00
Dirk Dougherty
378c304e8a
am f41bc120: am e46defea: am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:14:27 -07:00
Dirk Dougherty
0056e5eff5
am e46defea: am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:12:15 -07:00
Dirk Dougherty
8d5b2c4f2f
am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken
* commit '68b37d14708414d3cee418024c178f0a3c7d8b5b':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:10:10 -07:00
Dirk Dougherty
cd406480fa
am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp
* commit 'a04202b3258845688bcd8c6208222235569df733':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:08:46 -07:00
Dirk Dougherty
5d8d9f1ff1
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:05:03 -07:00
Jean-Michel Trivi
deb3d03c21
am 6d7334c1: am afbc5fad: Fix build Remove from API 9 definition the two methods that were removed from API 8.
2010-05-12 10:55:59 -07:00
Jean-Michel Trivi
d9ab4e0cef
am afbc5fad: Fix build Remove from API 9 definition the two methods that were removed from API 8.
2010-05-12 10:53:50 -07:00
Scott Main
317c7c9c8c
am 2c42852c: am 1d9b25a0: am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo
2010-05-12 09:26:11 -07:00
Dirk Dougherty
d1ed687c0b
am b796d698: am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
2010-05-12 09:26:07 -07:00
Dirk Dougherty
cf8b42d02b
am 271a15d8: am a1cdf279: am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
2010-05-12 09:26:02 -07:00
Scott Main
1b666d5d7a
am 7331e806: am 812266dd: am a250e328: am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
2010-05-12 09:25:56 -07:00
Brett Chabot
f1686172bb
am 342e520b: am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
2010-05-12 09:25:51 -07:00
Scott Main
edfada8e75
am 05d4198c: am 9809015b: am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
2010-05-12 09:25:46 -07:00
Scott Main
12ef779a49
am 604821f8: am 5b46aa36: am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles
2010-05-12 09:25:41 -07:00
Scott Main
2559f11980
am 7d653029: am 1dc7c4ab: am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-12 09:25:36 -07:00
Xavier Ducrohet
91fb1550bc
am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
2010-05-12 09:25:25 -07:00
Marco Nelissen
2975f47bb3
am 11291901: am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
2010-05-12 09:25:19 -07:00
Dianne Hackborn
80db60a121
am 5f1ebb9f: am bf00233b: am b6e1ec19: am 037cd341: Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
2010-05-12 09:25:13 -07:00
Scott Main
36d0b05a5c
am 1085d95a: am 856f0bad: am 84a30dbf: am 5cdf5fdc: docs: add document about app install location
2010-05-12 09:25:07 -07:00
Dirk Dougherty
e84b778a02
am 4f92d6a3: am a38f5e70: am 712f6408: am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
2010-05-12 09:24:59 -07:00
Scott Main
4c67ca5c61
am e695b670: am 5cb0d501: am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
2010-05-12 09:24:51 -07:00
Mike Lockwood
0b6453e4ea
am 4d0c3083: am c7c856fb: am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
2010-05-12 09:24:43 -07:00
Andreas Huber
c5e792014a
am 1d0e5599: am 11777d6f: am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
2010-05-12 09:24:35 -07:00
Andreas Huber
43690a672f
am 286a6355: am b076e6f3: am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
2010-05-12 09:24:28 -07:00
Costin Manolache
d72f440703
am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 09:24:20 -07:00
Jean-Michel Trivi
4a7f040367
am 4f9c9aa8: am fd5a747f: am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-12 09:24:12 -07:00
android-build SharedAccount
61b1681025
resolved conflicts with ae4043ce1db1e2b30c23ec3d5b22fd382b92d961 merge
...
Change-Id: I6618d37c717f592c9f016367395c2bce36215638
2010-05-12 09:21:52 -07:00
Jean-Michel Trivi
08c4903562
am 11e26c28: am 9f35d39a: am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play not
2010-05-12 09:14:19 -07:00
Wu-cheng Li
922e4902f4
am 9813a3a2: am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.
2010-05-12 09:14:11 -07:00
Scott Main
a338186970
am 1d9b25a0: am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo
2010-05-12 08:50:21 -07:00
Dirk Dougherty
bc759a01c7
am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
2010-05-12 08:50:16 -07:00
Dirk Dougherty
8adfe2d295
am a1cdf279: am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
2010-05-12 08:50:12 -07:00
Scott Main
31806cefd6
am 812266dd: am a250e328: am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
2010-05-12 08:50:08 -07:00
Brett Chabot
f14282e25b
am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
2010-05-12 08:49:57 -07:00
Scott Main
f8a36aa6de
am 9809015b: am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
2010-05-12 08:49:53 -07:00
Scott Main
59dd4b7d40
am 5b46aa36: am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles
2010-05-12 08:49:48 -07:00
Scott Main
2042adc37d
am 1dc7c4ab: am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-12 08:49:42 -07:00
Xavier Ducrohet
528596388c
am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
2010-05-12 08:49:37 -07:00
Marco Nelissen
2d0b5494e0
am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
2010-05-12 08:49:29 -07:00
Dianne Hackborn
870e7fb321
am bf00233b: am b6e1ec19: am 037cd341: Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
2010-05-12 08:49:23 -07:00
Scott Main
a611ec7fd1
am 856f0bad: am 84a30dbf: am 5cdf5fdc: docs: add document about app install location
2010-05-12 08:49:17 -07:00
Dirk Dougherty
595586331b
am a38f5e70: am 712f6408: am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
2010-05-12 08:49:00 -07:00
Scott Main
07391c450d
am 5cb0d501: am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
2010-05-12 08:48:54 -07:00
Mike Lockwood
fc1eeab8d0
am c7c856fb: am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
2010-05-12 08:48:42 -07:00
Andreas Huber
28e0941d2a
am 11777d6f: am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
2010-05-12 08:48:35 -07:00
Andreas Huber
efcebef912
am b076e6f3: am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
2010-05-12 08:48:28 -07:00
