The Android Open Source Project
aa8da3dc40
am a8e0f75b: am 7450c02a: am 900b6157: merge from open-source master
2010-05-14 15:15:36 -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
3e4fd9ea19
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
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
9fea8b35ef
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
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
The Android Open Source Project
5e4b1b29de
am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source master
2010-05-14 13:58:26 -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
Dirk Dougherty
ff7eddfcf9
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
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
6ae52006ab
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
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
6d0438bbc5
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
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
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
James Dong
8196e00d86
am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken
2010-05-14 12:22:18 -07:00
James Dong
ce3d8b316b
am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken
2010-05-14 12:21:03 -07:00
James Dong
d95266c6a8
Merge "Detect and handle premature termination of a recording session" into kraken
2010-05-14 12:19:17 -07:00
Nick Kralevich
4864b6fa8a
am 9efc829e: am 4e544e81: Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
2010-05-14 12:11:13 -07:00
Nick Kralevich
9efc829e61
am 4e544e81: Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
2010-05-14 12:09:02 -07:00
Chih-Chung Chang
84498a7ab5
am 9c192e44: am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
2010-05-14 12:08:24 -07:00
Nick Kralevich
4e544e8146
Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
2010-05-14 12:07:05 -07:00
Chih-Chung Chang
9c192e44c2
am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
2010-05-14 12:06:16 -07:00
Chih-Chung Chang
29f5d9b61d
Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
2010-05-14 12:05:06 -07:00
Scott Main
060341fa2d
am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
2010-05-14 11:59:04 -07:00
Scott Main
33c06f9158
am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
2010-05-14 11:57:46 -07:00
Scott Main
6c034325a8
am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
...
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken
* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
docs: add dev guide for backup
2010-05-14 11:56:14 -07:00
