Wu-cheng Li
678bd9df62
am 8dc80423: am ae7ca4c3: Fix build error.
2010-05-17 09:21:13 -07:00
Wu-cheng Li
5f1c1d360f
am a3b5ff07: am e339c5ed: Add camera focus distances API.
2010-05-17 09:21:03 -07:00
Dirk Dougherty
39841775c4
am cef60007: am aef87aa9: am c6b7a2d7: am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.
2010-05-17 09:20:56 -07:00
Mathias Agopian
7a9bdeb4f9
am 2ff19fa9: am 4606d5dd: Merge "fix uninitialized variable in DisplayHardware" into kraken
2010-05-17 09:20:49 -07:00
Wu-cheng Li
902e2248cc
am ae7ca4c3: Fix build error.
2010-05-14 22:10:36 -07:00
Wu-cheng Li
edce616a62
am e339c5ed: Add camera focus distances API.
2010-05-14 21:43:33 -07:00
Dirk Dougherty
5efcd31a72
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
2669e12fcc
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
42e980e1a0
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
ceb2eaf121
am 4606d5dd: Merge "fix uninitialized variable in DisplayHardware" into kraken
2010-05-14 18:37:04 -07:00
Mathias Agopian
0d184f0169
Merge "fix uninitialized variable in DisplayHardware" into kraken
2010-05-14 18:35:34 -07:00
Mathias Agopian
0d4e00dd6a
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
Jason Sams
550aef65b7
Merge "Delete legacy setDefine API."
2010-05-14 16:53:05 -07:00
Andreas Huber
dab466db0b
am bc30d1d8: 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:34:24 -07:00
Andreas Huber
d80f5067d5
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
Jason Sams
d53c35d4f6
Merge "Delete old createFromClass methods. It no longer makes sense to create type info from Java since this cannot be exported to scripts. The new flow is in the opposite direction."
2010-05-14 16:30:50 -07:00
Andreas Huber
4843fbd206
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
2188a17156
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
Nick Kralevich
c8d232b4da
Merge "resolved conflicts for merge of cbf26fd3 to master"
2010-05-14 16:11:43 -07:00
Jason Sams
255eda40ce
Merge "Change RS to use the passed surface size rather than EGL size. Its possible that during a resize the EGL information could be stale so caching this is bad. The surface size should always be correct."
2010-05-14 16:00:04 -07:00
Konstantin Lopyrev
11ca9ebd0c
Merge "Fix 2571606: Correct message after too many failed attempts for password and pin."
2010-05-14 15:52:55 -07:00
Nick Kralevich
15cb231c7d
resolved conflicts for merge of cbf26fd3 to master
...
Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6
2010-05-14 15:49:42 -07:00
Nick Kralevich
744790dbb9
am bfb776ac: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-14 15:30:15 -07:00
Nick Kralevich
cf44a76d7f
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
995fc3866a
am a8e0f75b: am 7450c02a: am 900b6157: merge from open-source master
2010-05-14 15:15:36 -07:00
The Android Open Source Project
92e388ceb0
am 7450c02a: am 900b6157: merge from open-source master
2010-05-14 15:14:04 -07:00
The Android Open Source Project
0259a7534f
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
4c53558835
merge from open-source master
...
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
2010-05-14 15:04:52 -07:00
Scott Main
70640a1dbb
am b73179c7: am b42bc066: am fb580943: am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
2010-05-14 14:30:00 -07:00
Scott Main
1f11ed1c46
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
58e1173cf0
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
cf6dd9bdef
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
Dirk Dougherty
9908241441
am 9d6bdc53: am 4d29493e: am 0d54b806: am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 14:05:26 -07:00
Dirk Dougherty
8ff11fa15c
am 4d29493e: am 0d54b806: am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 14:03:46 -07:00
Dirk Dougherty
0f27e3d642
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
d1ad52a21f
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
The Android Open Source Project
2872bbd8be
am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source master
2010-05-14 13:58:26 -07:00
Dirk Dougherty
9b0f549757
Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 13:58:12 -07:00
The Android Open Source Project
8c4874eb11
am 12b6f6ea: am 55b7d124: merge from open-source master
2010-05-14 13:56:41 -07:00
The Android Open Source Project
50c434ca21
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
Dirk Dougherty
171f2d0fa5
am cb0bdf19: am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:53:33 -07:00
The Android Open Source Project
4dd72e10ee
merge from open-source master
...
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
Dirk Dougherty
302beca3a5
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
81a2b68dcb
am af4dbcd8: am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:50:46 -07:00
Dirk Dougherty
078418eccd
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
4505e88a52
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
1e588cfedc
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
e5588e132b
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
2363a9d496
Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:46:42 -07:00
Dirk Dougherty
553f9c7dff
am e2fb67d4: am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:45:28 -07:00
