summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycombJason Sams2011-02-106-0/+205
|\ | | | | | | | | * commit 'cbcd93352b9fff3ada4a01c3094b24e5fafde97f': Basic 101 level compute example for RS.
| * Merge "Basic 101 level compute example for RS." into honeycombJason Sams2011-02-106-0/+205
| |\
| | * Basic 101 level compute example for RS.Jason Sams2011-02-096-0/+205
| | | | | | | | | | | | Change-Id: Ic196ebdf558c1b9661182e191e31d7f62448e73a
* | | am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into ↵Mathias Agopian2011-02-101-14/+48
|\ \ \ | |/ / | | | | | | | | | | | | | | | honeycomb * commit 'b66b7a2c183a1423ea629d4f73ed95f9b87d54b7': fix [3408713] Dialog window invisible sometimes
| * | Merge "fix [3408713] Dialog window invisible sometimes" into honeycombMathias Agopian2011-02-101-14/+48
| |\ \
| | * | fix [3408713] Dialog window invisible sometimesMathias Agopian2011-02-091-14/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | weak pointer comparison operators were implemented wrong, they were using the internal "unsafe" pointer. We could end up with two "equal" weak pointer pointing to different objects. this caused KeyedVector keyed by weak pointer to work incorrectly, in turn causing a window that just got added to a list to be immediately removed. Change-Id: Ib191010c39aafa9229109e4211f6c3b2b2f9696d
* | | | am 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycombDirk Dougherty2011-02-1016-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '12244c57960d85a066c94774e3e37685d0081213': Doc change: changes for 3.0 SDK
| * | | Merge "Doc change: changes for 3.0 SDK" into honeycombDirk Dougherty2011-02-1016-1/+1
| |\ \ \
| | * | | Doc change: changes for 3.0 SDKDirk Dougherty2011-02-1016-1/+1
| | | |/ | | |/| | | | | | | | | Change-Id: If94d2bd65f396491d0f5de333dfe30d18628edc9
* | | | am bbdc4ce2: Merge "clean up and add javadocs" into honeycombRobert Ly2011-02-1033-95/+246
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bbdc4ce254e4918f771e448cd4fa9602679eaf2b': clean up and add javadocs
| * | | Merge "clean up and add javadocs" into honeycombRobert Ly2011-02-1033-95/+246
| |\ \ \
| | * | | clean up and add javadocsRobert Ly2011-02-0933-95/+246
| | | | | | | | | | | | | | | | | | | | Change-Id: I7f628106247de887cd91c4a4b4b55d3ebfa700c8
* | | | | am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycombAlex Sakhartchouk2011-02-107-0/+290
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'efc48eea1541990046248b86e899c72b58c8506f': HelloWorld graphics sample for Renderscript.
| * | | | Merge "HelloWorld graphics sample for Renderscript." into honeycombAlex Sakhartchouk2011-02-107-0/+290
| |\ \ \ \
| | * | | | HelloWorld graphics sample for Renderscript.Alex Sakhartchouk2011-02-097-0/+290
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I7f5c4813a207a37f67c563407369a1dbc1be250d
* | | | | am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction ↵Alex Sakhartchouk2011-02-107-123/+46
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | in the right places." into honeycomb * commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05': Cleanup of the code in view to do creation/destruction in the right places.
| * | | | Merge "Cleanup of the code in view to do creation/destruction in the right ↵Alex Sakhartchouk2011-02-107-123/+46
| |\ \ \ \ | | | | | | | | | | | | | | | | | | places." into honeycomb
| | * | | | Cleanup of the code in view to do creation/destruction in the right places.Alex Sakhartchouk2011-02-097-123/+46
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I1c87682cc2c35ad5ee15c06cd78f48b612668181
* | | | | Ignore a8d3f02a from honeycomb - already thereJean-Baptiste Queru2011-02-100-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
| * | | | DO NOT MERGENick Pelly2011-02-0913-364/+1020
| | |/ / | |/| | | | | | | | | | | | | | | | | | Reconcile documentation updates from gingerbread to honeycomb. Change-Id: I8c199906beb5cd3c290ded123d6aefd0d1697f30
* | | | resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aospGilles Debunne2011-02-100-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
| * \ \ \ am 2050de5b: Text selection is broken.Gilles Debunne2011-02-091-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2050de5b9a5c097e30545ab822211d49031bd9dc': Text selection is broken.
| | * | | | Text selection is broken.Gilles Debunne2011-02-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3439569 Lazy initialization code was not back-ported. Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
* | | | | | am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms ↵Wink Saville2011-02-101-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation" * commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19': Telephony: Fix cb sms implementation
| * | | | | am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"Wink Saville2011-02-091-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7': Telephony: Fix cb sms implementation
| | * \ \ \ \ am 6e25789f: Merge "Telephony: Fix cb sms implementation"Wink Saville2011-02-091-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e25789fbe7ac283021156b17f406acb48850292': Telephony: Fix cb sms implementation
| | | * \ \ \ \ Merge "Telephony: Fix cb sms implementation"Wink Saville2011-02-091-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Telephony: Fix cb sms implementationAlex Yakavenka2011-02-081-0/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2a678e3ab99f0d5b9dd68cc4a79e1c5a58ecbe2
* | | | | | | | am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the ↵Mathias Agopian2011-02-100-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer ↵Mathias Agopian2011-02-092-6/+9
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | Merge "fix [3421350] Killing a game that uses the accelerometer renders the ↵Mathias Agopian2011-02-092-6/+9
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | device unable to sleep" into gingerbread
| | | * | | | | | fix [3421350] Killing a game that uses the accelerometer renders the device ↵Mathias Agopian2011-02-032-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unable to sleep when an app dies, make sure to disable all sensors that process is connected to, regardless of wether this was the LAST connection to this sensor. Change-Id: I400fa1c1389b2bd05a1d19abea8a35ec5bcba273
* | | | | | | | | am b605869c: am 07cefd3c: add 2.3.3 announcement to site home pageScott Main2011-02-101-10/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43': add 2.3.3 announcement to site home page
| * | | | | | | | am 07cefd3c: add 2.3.3 announcement to site home pageScott Main2011-02-091-10/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | | * commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd': add 2.3.3 announcement to site home page
| | * | | | | | add 2.3.3 announcement to site home pageScott Main2011-02-091-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
* | | | | | | | am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into ↵Jeff Hamilton2011-02-103-47/+117
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901': More documentation updates for NFC.
| * | | | | | | am 58c9d472: Merge "More documentation updates for NFC." into gingerbreadJeff Hamilton2011-02-093-47/+117
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9': More documentation updates for NFC.
| | * | | | | | Merge "More documentation updates for NFC." into gingerbreadJeff Hamilton2011-02-093-47/+117
| | |\ \ \ \ \ \
| | | * | | | | | More documentation updates for NFC.Jeff Hamilton2011-02-093-45/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
* | | | | | | | | am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android ↵Dirk Dougherty2011-02-100-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.3.3." into gingerbread * commit '8d56f6decf9efd29b286e02c549510d681b7573d': Doc change: Add version notes for Android 2.3.3.
| * | | | | | | | am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into ↵Dirk Dougherty2011-02-084-1/+438
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'a3f53afd13bc1722464e169cb82a01d3898852b5': Doc change: Add version notes for Android 2.3.3.
| | * | | | | | | Merge "Doc change: Add version notes for Android 2.3.3." into gingerbreadDirk Dougherty2011-02-084-1/+438
| | |\ \ \ \ \ \ \
| | | * | | | | | | Doc change: Add version notes for Android 2.3.3.Dirk Dougherty2011-02-084-1/+438
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
* | | | | | | | | am 47dac545: am 39cf3a44: Document NFC permissions.Nick Pelly2011-02-1011-12/+93
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47dac545da6468e5b46e940917eb6711c02b8e84': Document NFC permissions.
| * | | | | | | | am 39cf3a44: Document NFC permissions.Nick Pelly2011-02-0811-12/+93
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '39cf3a445e507f219ecc8a476f6038f095d9d520': Document NFC permissions.
| | * | | | | | | Document NFC permissions.Nick Pelly2011-02-0911-12/+93
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
* | | | | | | | am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground ↵Jeff Hamilton2011-02-101-6/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatch." into gingerbread * commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97': Improve the docs a bit for foreground dispatch.
| * | | | | | | am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into ↵Jeff Hamilton2011-02-081-6/+17
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '584afa8dde1777b181e773a491416769f25607a8': Improve the docs a bit for foreground dispatch.
| | * | | | | | Merge "Improve the docs a bit for foreground dispatch." into gingerbreadJeff Hamilton2011-02-081-6/+17
| | |\ \ \ \ \ \
| | | * | | | | | Improve the docs a bit for foreground dispatch.Jeff Hamilton2011-02-091-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
generated by cgit v1.1 at 2025-02-19 03:09:49 +0000