Dianne Hackborn
36bc4be02f
am e0a19573: am 39c31bba: am aa77de13: Fix issue #2686193 : Can\'t move apps to SD card
2010-05-14 23:15:06 -07:00
Dianne Hackborn
e0a19573d7
am 39c31bba: am aa77de13: Fix issue #2686193 : Can\'t move apps to SD card
...
Merge commit '39c31bbaf9bb07365a4b63144cdf625483851a08' into kraken
* commit '39c31bbaf9bb07365a4b63144cdf625483851a08':
Fix issue #2686193 : Can't move apps to SD card
2010-05-14 23:13:30 -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
Wu-cheng Li
8dc80423b6
am ae7ca4c3: Fix build error.
2010-05-14 22:10:36 -07:00
Wu-cheng Li
ae7ca4c32c
Fix build error.
...
Original name INFINITY conflicts with the macro in math.h.
Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e
2010-05-15 13:06:19 +08:00
Wu-cheng Li
a3b5ff075f
am e339c5ed: Add camera focus distances API.
2010-05-14 21:43:33 -07:00
Wu-cheng Li
e339c5edbe
Add camera focus distances API.
...
Applications can use this API to estimate the distance
between the subject and the camera.
bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
2010-05-15 12:40:54 +08:00
Dirk Dougherty
cef60007b5
am aef87aa9: am c6b7a2d7: am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.
2010-05-14 18:45:11 -07:00
Dirk Dougherty
aef87aa90c
am c6b7a2d7: am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.
...
Merge commit 'c6b7a2d704b6196c2f578302af607d58b0b85e4b' into kraken
* commit 'c6b7a2d704b6196c2f578302af607d58b0b85e4b':
Doc change: add sizes/sums for sdk/ndk/adt packages.
2010-05-14 18:43:45 -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
Mathias Agopian
2ff19fa9e5
am 4606d5dd: Merge "fix uninitialized variable in DisplayHardware" into kraken
2010-05-14 18:37:04 -07:00
Mathias Agopian
4606d5dd95
Merge "fix uninitialized variable in DisplayHardware" into kraken
2010-05-14 18:35:34 -07:00
Mathias Agopian
51c66aa4ce
fix uninitialized variable in DisplayHardware
...
this fixes the issue where the display is all messed-up sometimes.
Change-Id: I20be91b5166bfff0c6d353a777351842c9df8e95
2010-05-14 18:33:30 -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
bc30d1d851
am 5d75a181: am a5cd816c: 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.
2010-05-14 16:32:43 -07:00
Andreas Huber
5d75a18188
am a5cd816c: 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 'a5cd816c720ed87b91a33aa5d000a0d308c74453' into kraken
* commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453':
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:30:29 -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
Nick Kralevich
cbf26fd3bc
am bfb776ac: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-14 15:30:15 -07:00
Nick Kralevich
bfb776acf2
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-14 15:28:09 -07:00
The Android Open Source Project
a8e0f75b7f
am 7450c02a: am 900b6157: merge from open-source master
2010-05-14 15:14:04 -07:00
The Android Open Source Project
7450c02a35
am 900b6157: merge from open-source master
...
Merge commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff' into kraken
* commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff':
Only hold a weak pointer on SurfaceComposerClients
2010-05-14 15:12:17 -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
b73179c7c0
am b42bc066: am fb580943: am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
2010-05-14 14:28:11 -07:00
Scott Main
b42bc06675
am fb580943: am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
...
Merge commit 'fb580943133d3e9ad3e342b8038726b04686f283' into kraken
* commit 'fb580943133d3e9ad3e342b8038726b04686f283':
docs: fix broken link, reduce API info about backup and point to dev guide
2010-05-14 14:26:14 -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
9d6bdc5350
am 4d29493e: am 0d54b806: am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 14:03:46 -07:00
Dirk Dougherty
4d29493ea9
am 0d54b806: am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
...
Merge commit '0d54b806c62cbe3ae71ce21f5d8bad78b0bee279' into kraken
* commit '0d54b806c62cbe3ae71ce21f5d8bad78b0bee279':
Doc change: adjust compatibility doc.
2010-05-14 14:01:59 -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
658b7a5a1a
am 12b6f6ea: am 55b7d124: merge from open-source master
2010-05-14 13:56:41 -07:00
The Android Open Source Project
12b6f6eaee
am 55b7d124: merge from open-source master
...
Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken
* commit '55b7d1243f15395a102971e8fdc57444638729ac':
SetLocaleByCarrier, only if its not an unknown carrier.
2010-05-14 13:54:56 -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
cb0bdf19f5
am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:51:42 -07:00
Dirk Dougherty
ad8ce5346a
am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
...
Merge commit '3d52305faa682366eb34c30892ddd2b390940048' into kraken
* commit '3d52305faa682366eb34c30892ddd2b390940048':
Doc change: adjustments to the api changes description
2010-05-14 13:49:56 -07:00
Dirk Dougherty
af4dbcd85e
am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:48:56 -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
8072bdc6e2
am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
...
Merge commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b' into kraken
* commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b':
Doc change: add note about future instruction set support.
2010-05-14 13:47:07 -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
e2fb67d4bc
am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:43:39 -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
41a450cd8e
am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
...
Merge commit 'bf4cecd2822ff74c8c246d2595a836b5f1130ad8' into kraken
* commit 'bf4cecd2822ff74c8c246d2595a836b5f1130ad8':
Doc change: documentation for library projects in sdk.
2010-05-14 13:41:46 -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
