Patrick Scott
fdadb0cbdf
Merge "Do not merge." into honeycomb
2011-01-12 09:44:59 -08:00
Glenn Kasten
e2a0409096
am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
...
* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
Fix race in buffer ref counting.
2011-01-12 09:36:00 -08:00
Glenn Kasten
edc6925a3e
Merge "Fix race in buffer ref counting." into honeycomb
2011-01-12 09:34:37 -08:00
Cary Clark
69ed7a1b6b
am 688b0af6: Merge "add null check to copy selection" into honeycomb
...
* commit '688b0af6a888a8a427d9a4c82fedf3e345e6ae34':
add null check to copy selection
2011-01-12 08:21:03 -08:00
Cary Clark
ef3cd33054
Merge "add null check to copy selection" into honeycomb
2011-01-12 08:19:24 -08:00
Robert Greenwalt
4eebb7832c
am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
...
* commit 'a78e9f055834030ebe25480004f667f4bca35232':
Fix any_connection reporting.
2011-01-12 07:19:05 -08:00
Robert Greenwalt
27af3e0432
Merge "Fix any_connection reporting." into honeycomb
2011-01-12 07:16:56 -08:00
satok
544c931106
am 31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
...
* commit '31d9d895d79977fa4e6dff2491b209fbeb21c61b':
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
2011-01-12 01:20:24 -08:00
satok
c7f66c9795
Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
2011-01-12 01:17:58 -08:00
Brad Fitzpatrick
6ddbec9150
am 52d70722: am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
...
* commit '52d70722654548d156bd7a1cb8c1f05b94b09f06':
Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-12 00:04:27 -08:00
Dianne Hackborn
556524d108
am a9d8a69a: am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit 'a9d8a69a044c8e0c2d3268ed98bd17063faaeb1e':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-12 00:04:18 -08:00
Chris Tate
439f94c05f
am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit '69f8d3c667669dc1858c21ee798c0f836f53235e':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-12 00:04:12 -08:00
Chris Tate
c92a1b4142
am 9b1bd2c7: (-s ours) am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
...
* commit '9b1bd2c7d1acffa1079d589811450140518e5ce5':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-12 00:04:04 -08:00
Dianne Hackborn
5e0f28139e
am 412ebd6f: am 433863b1: Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
* commit '412ebd6f9d18eebc11d8473318316aef1dfc5caa':
Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-12 00:03:53 -08:00
Dianne Hackborn
e3e91d9833
am 95db1cfc: am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
...
* commit '95db1cfc741c23c7f4192128e3b7bb3c43761bdb':
2011-01-12 00:03:45 -08:00
Wei-Ta Chen
29a0551cab
am 4b9adfbe: Merge "Correct the API comments." into honeycomb
...
* commit '4b9adfbe7d0cf578b82eb7794c506ad1986854b9':
Correct the API comments.
2011-01-11 23:18:29 -08:00
Wei-Ta Chen
ceb57a5448
Merge "Correct the API comments." into honeycomb
2011-01-11 23:16:15 -08:00
Svetoslav Ganov
29fe411de0
am 2ad2bf23: Merge "Renaming NumberPicker resources to be consistent." into honeycomb
...
* commit '2ad2bf232714009586c5163e08754886bdd9ea20':
Renaming NumberPicker resources to be consistent.
2011-01-11 21:58:22 -08:00
Svetoslav Ganov
d351bee14f
Merge "Renaming NumberPicker resources to be consistent." into honeycomb
2011-01-11 21:56:03 -08:00
Christopher Tate
f2dc693115
am 28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
...
* commit '28514f8f9cdac95799d5654a30fe36ef05443dd3':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
2011-01-11 20:03:57 -08:00
Christopher Tate
d3151cb96d
Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
2011-01-11 20:02:35 -08:00
Chung-yih Wang
0c5b01a7e4
am 8df7b060: Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
...
* commit '8df7b060fa8d3eb6d9874af01f2d189d0ceb74d7':
Merge "Add auth. username in SipProfile." from gingerbread.
2011-01-11 19:49:34 -08:00
Chung-yih Wang
8cd900103f
Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
2011-01-11 19:47:48 -08:00
Romain Guy
d5dd720505
am 9688fdf5: am fcf3d12d: Merge "Typo in Javadoc"
...
* commit '9688fdf51edb82a73e1a6d436bf7bce706c049fb':
Typo in Javadoc
2011-01-11 19:34:38 -08:00
Stephen Hines
d8f9500af9
am 78dd1ef3: Merge "Clean up RS math headers." into honeycomb
...
* commit '78dd1ef3f70ff80bf9697ba53601bda48451c044':
Clean up RS math headers.
2011-01-11 19:12:23 -08:00
Stephen Hines
8c0d3c7256
Merge "Clean up RS math headers." into honeycomb
2011-01-11 19:09:47 -08:00
Svetoslav Ganov
7738e77e66
am 5220834c: Merge "Down arrow on the month can end up at the start of the month" into honeycomb
...
* commit '5220834c6ccdabf949dfe7160548ad378850d71b':
Down arrow on the month can end up at the start of the month
2011-01-11 18:06:46 -08:00
Svetoslav Ganov
ad6fbf27f7
Merge "Down arrow on the month can end up at the start of the month" into honeycomb
2011-01-11 18:04:42 -08:00
Romain Guy
3ada6e2bc1
am 6ed4a2f7: Merge "Disable the region compositing pipeline for layers." into honeycomb
...
* commit '6ed4a2f72531c2d9f256c19b09414aa9ea5da8c5':
Disable the region compositing pipeline for layers.
2011-01-11 18:00:31 -08:00
Dianne Hackborn
dc5c74aaad
am 45a8f53b: Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
...
* commit '45a8f53b25c8306c7f2c37f3a1d70ace21956e28':
Get rid of old ParcelFileDescriptor API.
2011-01-11 18:00:26 -08:00
Romain Guy
e46d676465
Merge "Disable the region compositing pipeline for layers." into honeycomb
2011-01-11 17:58:56 -08:00
Romain Guy
ef846d979c
am 5f6e583c: Merge "Don\'t break the build!" into honeycomb
...
* commit '5f6e583cc8c27ac2eb217a7d1065a6aeda00a033':
Don't break the build!
2011-01-11 17:58:18 -08:00
Dianne Hackborn
1d74903a40
Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
2011-01-11 17:57:19 -08:00
Svetoslav Ganov
e4ca425878
am 147f7df3: Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
...
* commit '147f7df35c554cf24287c732f8b74b0018e1ddbe':
IAE: Service not registered: com.android.server.AccessibilityManagerService
2011-01-11 17:56:11 -08:00
Romain Guy
b3f10c9f33
Merge "Don't break the build!" into honeycomb
2011-01-11 17:56:09 -08:00
Romain Guy
bcb956b43f
am d139a0ca: Merge "Better backend for hardware layers." into honeycomb
...
* commit 'd139a0ca25dbabfaeaed6383f3177704fe0183e2':
Better backend for hardware layers.
2011-01-11 17:53:58 -08:00
Svetoslav Ganov
9f19be3025
Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
2011-01-11 17:53:15 -08:00
Romain Guy
bc3b90c335
Merge "Better backend for hardware layers." into honeycomb
2011-01-11 17:52:05 -08:00
Jason Sams
668418691a
am d345505a: Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel sizes." into honeycomb
...
* commit 'd345505a32f991ffb74639795451f545141b8890':
Add error checks to bitmap uploads. Fix java side calculation for pixel sizes.
2011-01-11 17:47:42 -08:00
Svetoslav Ganov
c36e6204c8
am 49c771c4: Merge "WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content." into honeycomb
...
* commit '49c771c4da8bb7cf135e6afed3a901b1744beb67':
WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content.
2011-01-11 17:45:37 -08:00
Jason Sams
07b419a9a1
Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel sizes." into honeycomb
2011-01-11 17:44:39 -08:00
Svetoslav Ganov
34425f6f3c
Merge "WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content." into honeycomb
2011-01-11 17:43:01 -08:00
Eric Fischer
4b8bc27b89
am 2ea2553b: Merge "Update large-screen translations." into honeycomb
...
* commit '2ea2553bda727f60fb05043cd13588091533f551':
Update large-screen translations.
2011-01-11 17:41:01 -08:00
Eric Fischer
ad54ee163c
Merge "Update large-screen translations." into honeycomb
2011-01-11 17:39:12 -08:00
Justin Ho
fbc277abd3
am 2d2899f9: Merge "Updated expander assets from Gingerbread" into honeycomb
...
* commit '2d2899f9ff292ecb7d1d8564ed52229bdd93819b':
Updated expander assets from Gingerbread
2011-01-11 17:36:38 -08:00
Justin Ho
f6f7e57b82
Merge "Updated expander assets from Gingerbread" into honeycomb
2011-01-11 17:34:34 -08:00
Irfan Sheriff
cc7d8dc6b6
am 7ac190d6: Merge "default wifi sleep policy change" into honeycomb
...
* commit '7ac190d60d794b5f75b094a0b9a3f666742d42fb':
default wifi sleep policy change
2011-01-11 17:28:39 -08:00
Irfan Sheriff
175db6889b
Merge "default wifi sleep policy change" into honeycomb
2011-01-11 17:26:18 -08:00
Xavier Ducrohet
6e5a4f9e34
am 3a762f2f: Merge "LayoutLib: Log error when style can\'t be found." into honeycomb
...
* commit '3a762f2fd1447868c028978ef57801f5f246a504':
LayoutLib: Log error when style can't be found.
2011-01-11 17:25:27 -08:00
Xavier Ducrohet
44420e6b0a
Merge "LayoutLib: Log error when style can't be found." into honeycomb
2011-01-11 17:24:06 -08:00