Kenny Root
8ea405d196
am cfa2de30: Import revised translations
...
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp
* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
Import revised translations
2010-05-17 11:37:35 -07:00
Kenny Root
cfa2de303e
Import revised translations
...
Change-Id: Id6bd3011874ff8544a030473cc994f9a0201c97d
2010-05-17 11:18:04 -07:00
The Android Open Source Project
8382068ef2
merge from open-source master
...
Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
2010-05-17 10:38:00 -07:00
Jean-Baptiste Queru
1152df7e82
Merge "Updated RGB LED test cases"
2010-05-17 09:12:43 -07:00
The Android Open Source Project
f7fb5331e5
merge from open-source master
...
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
2010-05-17 08:56:54 -07:00
Romain Guy
c4fee63301
Merge "Fixing indeterminate progress bar animation state."
2010-05-15 12:34:05 -07:00
David Sobreira Marques
52a35433cf
Fixing indeterminate progress bar animation state.
...
When showing a progress bar instance more than once
it will not animate after the first time.
Change-Id: I5104c551d561755005e533f2ab5257454567bf71
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com >
2010-05-15 16:10:18 -03:00
Chung-yih Wang
c7388e3541
am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
...
Merge commit '5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp
* commit '5f1beda18fc7709c2e61ace33607513770faf115':
Make the SSID field of WifiConfiguration consistent with API description.
2010-05-14 23:16:31 -07:00
Chung-yih Wang
5f1beda18f
Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
2010-05-14 23:15:04 -07:00
Dianne Hackborn
39c31bbaf9
am aa77de13: Fix issue #2686193 : Can\'t move apps to SD card
...
Merge commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c' into froyo-plus-aosp
* commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c':
Fix issue #2686193 : Can't move apps to SD card
2010-05-14 23:11:33 -07:00
Dianne Hackborn
aa77de1348
Fix issue #2686193 : Can't move apps to SD card
...
Change-Id: Icd84d8080d33fb8ce5103a0e726d50f0ec70092e
2010-05-14 22:33:54 -07:00
Chung-yih Wang
047076d170
Make the SSID field of WifiConfiguration consistent with API description.
...
Bug id http://b/issue?id=2684571
Change-Id: I809478991ba606252d69ef007339754ab2856416
2010-05-15 11:03:30 +08:00
Jeff Hamilton
2c07e7b926
Merge "Modified libdrm to support SuperH platform"
2010-05-14 19:36:40 -07:00
Dirk Dougherty
c6b7a2d704
am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.
...
Merge commit 'd1e9d590941303c004459f3d798b26f1bf091535' into froyo-plus-aosp
* commit 'd1e9d590941303c004459f3d798b26f1bf091535':
Doc change: add sizes/sums for sdk/ndk/adt packages.
2010-05-14 18:42:11 -07:00
Dirk Dougherty
d1e9d59094
Doc change: add sizes/sums for sdk/ndk/adt packages.
...
Change-Id: I9385c5b90a8f366764337adf4221fba4d7448568
2010-05-14 18:14:42 -07:00
Andreas Huber
a5cd816c72
am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
...
Merge commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp
* commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
2010-05-14 16:28:09 -07:00
Andreas Huber
eb9128f9b0
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
...
Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511
related-to-bug: 2686604
QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http
2010-05-14 15:32:21 -07:00
The Android Open Source Project
900b6157f5
merge from open-source master
...
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
2010-05-14 15:04:52 -07:00
Scott Main
fb58094313
am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
...
Merge commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49' into froyo-plus-aosp
* commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49':
docs: fix broken link, reduce API info about backup and point to dev guide
2010-05-14 14:24:44 -07:00
Scott Main
826c9f7773
docs: fix broken link, reduce API info about backup and point to dev guide
...
Change-Id: If6470f1753917819e2f73fbba8947f082a26f720
2010-05-14 14:17:04 -07:00
Dirk Dougherty
0d54b806c6
am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
...
Merge commit '60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp
* commit '60026c3ab0093e6d4cd464061ab9f36d4d041532':
Doc change: adjust compatibility doc.
2010-05-14 14:00:12 -07:00
Dirk Dougherty
60026c3ab0
Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 13:58:12 -07:00
The Android Open Source Project
55b7d1243f
merge from open-source master
...
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
Dirk Dougherty
51d812b83b
Doc change: adjust compatibility doc.
...
Change-Id: I74f9fba81de4d358ecccfe1ef0c69f0e83e1a7c5
2010-05-14 13:52:30 -07:00
Dirk Dougherty
3d52305faa
am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
...
Merge commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp
* commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e':
Doc change: adjustments to the api changes description
2010-05-14 13:48:04 -07:00
Dirk Dougherty
59cfe7137c
Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:46:42 -07:00
Dirk Dougherty
877fb9a2cb
Doc change: adjustments to the api changes description
...
Change-Id: I9373b424ae008face124e38a163c980608c2e4df
2010-05-14 13:45:27 -07:00
Dirk Dougherty
cae9cfeed7
am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
...
Merge commit 'bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp
* commit 'bba70cdba284c3d76cab9843e44097d664882938':
Doc change: add note about future instruction set support.
2010-05-14 13:45:17 -07:00
Dirk Dougherty
bba70cdba2
Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:43:19 -07:00
Dirk Dougherty
bf4cecd282
am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
...
Merge commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp
* commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d':
Doc change: documentation for library projects in sdk.
2010-05-14 13:40:19 -07:00
Jean-Baptiste Queru
5b9fb5ab7e
Merge "Only hold a weak pointer on SurfaceComposerClients"
2010-05-14 13:39:48 -07:00
Dirk Dougherty
89969d4cda
Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:38:20 -07:00
Dirk Dougherty
de98f6e397
Doc change: add note about future instruction set support.
...
Change-Id: If954c1020301f5935c8d9328a531afdddbdad8db
2010-05-14 13:37:01 -07:00
Dirk Dougherty
a3245648d6
Doc change: documentation for library projects in sdk.
...
Change-Id: I615d24a046ba2858676e985072563cc90a906551
2010-05-14 13:27:39 -07:00
Scott Main
6d8e4fd83b
am b83a283a: docs: add dev guide for backup
...
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp
* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
docs: add dev guide for backup
2010-05-14 11:53:44 -07:00
Scott Main
b83a283ac1
docs: add dev guide for backup
...
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
2010-05-14 11:47:42 -07:00
Jean-Baptiste Queru
a2adf8f394
Merge "SetLocaleByCarrier, only if its not an unknown carrier."
2010-05-14 11:39:06 -07:00
The Android Open Source Project
1d628c5d3d
merge from open-source master
...
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
2010-05-14 09:44:36 -07:00
The Android Open Source Project
9167ba50e4
merge from open-source master
...
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
2010-05-14 09:11:31 -07:00
Jean-Baptiste Queru
75e181b633
Merge "Accept media files by file extension in case insensitive manner."
2010-05-14 09:06:43 -07:00
Dirk Dougherty
d48e0382c3
am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
...
Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp
* commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
Doc change: adjustments for ndk feature description
2010-05-13 21:32:21 -07:00
Dirk Dougherty
fb473bb611
Merge "Doc change: adjustments for ndk feature description" into froyo
2010-05-13 21:31:10 -07:00
Dirk Dougherty
346930b74d
Doc change: adjustments for ndk feature description
...
Change-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90
2010-05-13 21:28:45 -07:00
Dirk Dougherty
d317edabe1
am a0711e7b: Doc change: Add compatibility article.
...
Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp
* commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
Doc change: Add compatibility article.
2010-05-13 21:26:22 -07:00
Dirk Dougherty
a0711e7b39
Doc change: Add compatibility article.
...
Change-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08
2010-05-13 21:22:44 -07:00
Joe Onorato
1b44ebda70
Merge "Put the wifi status icon in the right place."
2010-05-13 16:33:22 -07:00
Suchi Amalapurapu
b63ea5f784
am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
...
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp
* commit 'c928a11e34678296511d5ea34582292be7368618':
Fix 2672155
2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34
Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070
Fix 2672155
...
Check the code path when enabling disabling packages.
Add unit test
Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
2010-05-13 15:48:39 -07:00
The Android Open Source Project
b1110149cc
merge from open-source master
...
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
2010-05-13 14:50:16 -07:00