Alex Sakhartchouk
|
ccfbd36925
|
am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
* commit 'efc48eea1541990046248b86e899c72b58c8506f':
HelloWorld graphics sample for Renderscript.
|
2011-02-10 15:08:14 -08:00 |
|
Alex Sakhartchouk
|
d758cc306d
|
am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
* commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
Cleanup of the code in view to do creation/destruction in the right places.
|
2011-02-10 15:07:59 -08:00 |
|
Jean-Baptiste Queru
|
6d2cb2f356
|
Ignore a8d3f02a from honeycomb - already there
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
|
2011-02-10 14:49:12 -08:00 |
|
Gilles Debunne
|
23820f6a89
|
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
|
2011-02-10 14:43:35 -08:00 |
|
Wink Saville
|
11b5325535
|
am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
Telephony: Fix cb sms implementation
|
2011-02-10 13:53:10 -08:00 |
|
Mathias Agopian
|
71fcb03f87
|
am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit 'd0f27f435eb8a2c7e5841da68760d1f023fcf919':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
|
2011-02-10 13:53:01 -08:00 |
|
Scott Main
|
3ac3afb0f3
|
am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
* commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43':
add 2.3.3 announcement to site home page
|
2011-02-10 13:52:57 -08:00 |
|
Jeff Hamilton
|
2ac5673e83
|
am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
More documentation updates for NFC.
|
2011-02-10 13:52:48 -08:00 |
|
Dirk Dougherty
|
0cbf55999f
|
am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit '8d56f6decf9efd29b286e02c549510d681b7573d':
Doc change: Add version notes for Android 2.3.3.
|
2011-02-10 13:52:40 -08:00 |
|
Nick Pelly
|
6f1ae086a9
|
am 47dac545: am 39cf3a44: Document NFC permissions.
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
Document NFC permissions.
|
2011-02-10 13:52:34 -08:00 |
|
Jeff Hamilton
|
165c1ad42f
|
am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
Improve the docs a bit for foreground dispatch.
|
2011-02-10 13:52:23 -08:00 |
|
Eric Fischer
|
0c365669ad
|
am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
Import revised translations. DO NOT MERGE
|
2011-02-10 13:50:51 -08:00 |
|
Scott Main
|
22201fb079
|
am 129c7372: am 3c01a139: rename SIP doc title
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
rename SIP doc title
|
2011-02-10 13:50:44 -08:00 |
|
Scott Main
|
81363d359f
|
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
|
2011-02-10 13:47:32 -08:00 |
|
Katie McCormick
|
b91f20af98
|
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
|
2011-02-10 12:38:07 -08:00 |
|
Alex Sakhartchouk
|
4782b521f6
|
Merge "HelloWorld graphics sample for Renderscript." into honeycomb
|
2011-02-10 09:53:30 -08:00 |
|
Alex Sakhartchouk
|
4029472744
|
Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
|
2011-02-10 09:51:34 -08:00 |
|
Gilles Debunne
|
4dffae1718
|
am 2050de5b: Text selection is broken.
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
|
2011-02-09 16:49:42 -08:00 |
|
Alex Sakhartchouk
|
31e6d2e0d3
|
am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
DO NOT MERGE Removing an activity that shouldn't go into samples
|
2011-02-09 15:23:54 -08:00 |
|
Dirk Dougherty
|
257497d912
|
am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
Doc change: add diff report for API 11
|
2011-02-09 15:21:49 -08:00 |
|
Alex Sakhartchouk
|
65bcbcc831
|
Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb
|
2011-02-09 15:20:21 -08:00 |
|
Dirk Dougherty
|
4917dbf6a5
|
Merge "Doc change: add diff report for API 11" into honeycomb
|
2011-02-09 15:19:08 -08:00 |
|
Dirk Dougherty
|
094217876b
|
am fefa95a9: Doc change: Add version notes for Android 2.3.3.
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
Doc change: Add version notes for Android 2.3.3.
|
2011-02-09 14:20:06 -08:00 |
|
Wink Saville
|
614a618526
|
am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
|
2011-02-09 13:45:37 -08:00 |
|
Wink Saville
|
76615d7b6f
|
am 6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
|
2011-02-09 13:42:45 -08:00 |
|
Mathias Agopian
|
42ebf195b2
|
am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
fix [3374821] Cannot take screenshot of HC preview
|
2011-02-09 13:22:46 -08:00 |
|
Mathias Agopian
|
5d90264a79
|
Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
|
2011-02-09 13:18:53 -08:00 |
|
Wink Saville
|
0db20b9d86
|
Merge "Telephony: Fix cb sms implementation"
|
2011-02-09 13:09:24 -08:00 |
|
Mathias Agopian
|
4ed86b8f5c
|
am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
|
2011-02-09 13:09:12 -08:00 |
|
Mathias Agopian
|
6cb8fc11ee
|
Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
|
2011-02-09 13:06:00 -08:00 |
|
Scott Main
|
32904147c2
|
am 07cefd3c: add 2.3.3 announcement to site home page
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
add 2.3.3 announcement to site home page
|
2011-02-09 13:03:11 -08:00 |
|
Dirk Dougherty
|
93457e74e9
|
am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
Doc change: Add diff report for api 10.
|
2011-02-09 12:19:54 -08:00 |
|
Gilles Debunne
|
78fd484d9b
|
am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
Fix for multiple merge problem.
|
2011-02-09 12:19:46 -08:00 |
|
Eric Fischer
|
b14ac99db7
|
am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
Import revised translations. DO NOT MERGE
|
2011-02-09 10:47:47 -08:00 |
|
Eric Fischer
|
aa9484720d
|
Merge "Import revised translations. DO NOT MERGE" into honeycomb
|
2011-02-09 10:11:18 -08:00 |
|
Jeff Hamilton
|
1ce30b2dfa
|
am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
More documentation updates for NFC.
|
2011-02-09 00:36:53 -08:00 |
|
Jeff Hamilton
|
0858b00d05
|
Merge "More documentation updates for NFC." into gingerbread
|
2011-02-09 00:34:22 -08:00 |
|
Dirk Dougherty
|
714319b575
|
am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
Doc change: Add version notes for Android 2.3.3.
|
2011-02-08 23:27:53 -08:00 |
|
Nick Pelly
|
3d7a394315
|
am 39cf3a44: Document NFC permissions.
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
Document NFC permissions.
|
2011-02-08 23:25:29 -08:00 |
|
Dirk Dougherty
|
6e0c56dfe3
|
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
|
2011-02-08 23:24:22 -08:00 |
|
Gilles Debunne
|
82f05a1673
|
Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp
|
2011-02-08 20:38:59 -08:00 |
|
Gilles Debunne
|
c1b753b09b
|
resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp
Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e
|
2011-02-08 20:36:04 -08:00 |
|
Jeff Hamilton
|
b9e98d8c6a
|
am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
|
2011-02-08 19:33:53 -08:00 |
|
Jeff Hamilton
|
c9cda41f02
|
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
|
2011-02-08 19:30:47 -08:00 |
|
Scott Main
|
0461cb7364
|
am 3f41d8f5: docs: fix a couple titles
* commit '3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
docs: fix a couple titles
|
2011-02-08 18:48:53 -08:00 |
|
Scott Main
|
497b81b7eb
|
am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
* commit 'f002b6752562a442c934bdf7c04cb0fedc24d442':
docs: shorten and revise some titles in the Developing docs and resolve respective links
|
2011-02-08 18:39:24 -08:00 |
|
Scott Main
|
b7e4dc39a1
|
Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
|
2011-02-08 18:36:04 -08:00 |
|
Eric Fischer
|
b5c24f2871
|
am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
|
2011-02-08 17:32:18 -08:00 |
|
Scott Main
|
ace630d9c1
|
am 3c01a139: rename SIP doc title
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
rename SIP doc title
|
2011-02-08 17:32:14 -08:00 |
|
Scott Main
|
a12ed5ec38
|
am c442bc60: docs: move the SIP guide into guide/network/
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
docs: move the SIP guide into guide/network/
|
2011-02-08 17:32:06 -08:00 |
|