Shih-wei Liao
dfd144493d
am f6dd9c53: Merge "On-device linking." into honeycomb
...
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
On-device linking.
2011-01-13 02:07:39 -08:00
Shih-wei Liao
44c0cda62d
am 3ae5017b: Merge "convert2uchar3." into honeycomb
...
* commit '3ae5017b1bc2910610194cc8790e8d96516ac9b5':
convert2uchar3.
2011-01-13 02:05:32 -08:00
Shih-wei Liao
ddd39c9199
Merge "On-device linking." into honeycomb
2011-01-13 02:04:00 -08:00
Shih-wei Liao
93d5b249f8
Merge "convert2uchar3." into honeycomb
2011-01-13 02:03:51 -08:00
Adam Powell
0cbded3c88
am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
...
* commit '2ea9aaa2458ca468b8f127d8c69746a009df12a6':
Fix bugs 3077517 and 3309579 - ListView bugs
2011-01-12 23:52:25 -08:00
Adam Powell
ab6ab09b63
Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
2011-01-12 23:50:05 -08:00
Guang Zhu
f04d3cc27c
am 37f81344: Merge "change webkit test data path" into honeycomb
...
* commit '37f813443dbe51277c2d849eb2b53caa137d50f7':
change webkit test data path
2011-01-12 23:32:00 -08:00
Guang Zhu
79e734ace3
Merge "change webkit test data path" into honeycomb
2011-01-12 23:29:53 -08:00
Justin Ho
287732aedf
am cd0331ab: Fixing broken dropdown asset in Honeycomb as well
...
* commit 'cd0331abd7eb1e9efff3251caa008492fe5cad35':
Fixing broken dropdown asset in Honeycomb as well
2011-01-12 22:59:33 -08:00
Andy Stadler
fc038a6863
am 7b0f8f08: API changes to support encryption in DPM
...
* commit '7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
API changes to support encryption in DPM
2011-01-12 21:17:03 -08:00
Jaikumar Ganesh
331400f8b8
am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
...
* commit '471de1f5b3cc629739d8315ff195d6af928e7ae4':
DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 20:48:51 -08:00
Eric Laurent
67639b59be
am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread
...
* commit '48f400c3762bd50603222cb5e7856d6aef4ebc4e':
Fix issue 3302649.
2011-01-12 20:48:44 -08:00
Justin Ho
42a3c20b82
am 58ea9394: (-s ours) am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
...
* commit '58ea93945b6cd7b91d2d54845275fd90ee7fb291':
Updated flightmode assets
2011-01-12 20:48:38 -08:00
Chet Haase
a4174f5cc1
am 7cc5e1d5: Merge "Fix null crash when fragments go away during animations" into honeycomb
...
* commit '7cc5e1d5488c9e0a3f898a62b626ffb3ae074440':
Fix null crash when fragments go away during animations
2011-01-12 20:36:59 -08:00
Chet Haase
593d9a93d9
Merge "Fix null crash when fragments go away during animations" into honeycomb
2011-01-12 20:34:32 -08:00
Christopher Tate
aa0f983743
am 44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
...
* commit '44a94bb5a915922400944f666b218f4bb268c565':
Turn off debugging logspam for release
2011-01-12 20:25:32 -08:00
Christopher Tate
c130476861
Merge "Turn off debugging logspam for release" into honeycomb
2011-01-12 20:23:49 -08:00
Jim Miller
b9b09ff161
am 66707eee: Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
...
* commit '66707eee84ee874f60ff5d25c5d2d00769e79616':
Fix 3253629: Tweaks to recent apps
2011-01-12 20:10:28 -08:00
Jim Miller
efee4a3538
Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
2011-01-12 20:07:36 -08:00
Kenny Root
6b9b818948
am 0ee29447: am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
...
* commit '0ee294470d09e1de0ce0fe6e3246e98e450a4d26':
Allow updated system apps to retain priority
2011-01-12 19:01:48 -08:00
Andreas Huber
d81436b00d
am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
* commit 'c88b2c44117e7e3ff3deb786f7d984f4096a63de':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 19:01:37 -08:00
Andreas Huber
b2bc1bb5ff
am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
...
* commit '0ef0d76a9d5477942d5586933d35d299671fadc5':
DO NOT MERGE: Fix Matroska issues
2011-01-12 19:01:17 -08:00
Chet Haase
695e85dcdd
am ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
...
* commit 'ef9932c2505eaf5a4256c6c398aa640bee3b47ea':
Supress layout requests while a LayoutTransition is running.
2011-01-12 18:35:14 -08:00
Chet Haase
3bb966338b
Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
2011-01-12 18:33:05 -08:00
Xavier Ducrohet
923977448c
am cb27d4b2: Merge "LayoutLib: use tags in logs." into honeycomb
...
* commit 'cb27d4b2f530033c90432745115b914d8f26c3e7':
LayoutLib: use tags in logs.
2011-01-12 18:24:52 -08:00
Xavier Ducrohet
262d0eb2c0
Merge "LayoutLib: use tags in logs." into honeycomb
2011-01-12 18:23:04 -08:00
repo sync
cd3bf6ab65
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
...
* commit 'd439ac396ecb9e909c543424211d563325fea72b':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
2011-01-12 17:58:48 -08:00
Kenny Root
4d55db3c88
am 4aab4bc2: am 91c459ec: Copy user info from PackageSetting as well
...
* commit '4aab4bc2a3b97e25573e8484d5f5aa8deb812d48':
Copy user info from PackageSetting as well
2011-01-12 17:58:25 -08:00
Chung-yih Wang
9cdc17ab15
am eb74d1aa: am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
...
* commit 'eb74d1aab5f67ae3a4123fbab9a419595fab081c':
Add auth. username in SipProfile.
2011-01-12 17:58:08 -08:00
Nick Pelly
bcaab29a1f
am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
...
* commit 'a058f565663253077c3118d9aad00e03dcd45684':
Update API current.xml to unbreak build.
2011-01-12 17:57:30 -08:00
Carl Shapiro
35b29de581
am e9739d09: Merge "Note the release in which functionality was deprecated." into honeycomb
...
* commit 'e9739d09cb53fd05cc9229049b3d54c7f6816450':
Note the release in which functionality was deprecated.
2011-01-12 17:23:37 -08:00
Carl Shapiro
559acb0c46
Merge "Note the release in which functionality was deprecated." into honeycomb
2011-01-12 17:21:46 -08:00
Elliott Hughes
44e8d146aa
am f7bb4044: Merge "Fix build." into honeycomb
...
* commit 'f7bb4044e3e11845fd0980ad2393236add5b32ac':
Fix build.
2011-01-12 17:16:17 -08:00
Elliott Hughes
0efc8e9335
Merge "Fix build." into honeycomb
2011-01-12 17:14:43 -08:00
Joe Onorato
c29249784b
am f4699efb: Merge "Possibly fix bad notification updates." into honeycomb
...
* commit 'f4699efb635dc7695e346343e9b9024ed225a612':
Possibly fix bad notification updates.
2011-01-12 17:09:06 -08:00
Joe Onorato
d708400c1f
Merge "Possibly fix bad notification updates." into honeycomb
2011-01-12 17:07:11 -08:00
Carl Shapiro
541d75c9ad
am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb
...
* commit '0123afbb228c2849f481b5219ce82c070562b04a':
Deprecate the allocation limit interfaces.
2011-01-12 17:04:38 -08:00
Carl Shapiro
f01c2a64f0
Merge "Deprecate the allocation limit interfaces." into honeycomb
2011-01-12 17:02:18 -08:00
James Dong
48d3229c73
am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb
...
* commit '14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
Remove legacy code that should not be used
2011-01-12 16:41:36 -08:00
James Dong
d1b8deb429
Merge "Remove legacy code that should not be used" into honeycomb
2011-01-12 16:39:43 -08:00
Romain Guy
9517572279
am d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb
...
* commit 'd6b13534d44faee5bf80eb02495c17aa0195d381':
Only enable GL rendering on the main thread.
2011-01-12 16:24:27 -08:00
Romain Guy
64457f1e73
Merge "Only enable GL rendering on the main thread." into honeycomb
2011-01-12 16:22:48 -08:00
Amith Yamasani
680a2e3642
am e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb
...
* commit 'e1c99a1f5bb86066d2e9ea48b27cf60d1b78544b':
Remove popup indicator for dialog style preference items.
2011-01-12 16:00:59 -08:00
Amith Yamasani
22ac53c5c0
Merge "Remove popup indicator for dialog style preference items." into honeycomb
2011-01-12 15:59:02 -08:00
Joe Onorato
688f7e2a43
am 895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb
...
* commit '895eee7bac7dad66b51406d23529bec1dc9ad901':
Remove the volume slider in SystemUI.
2011-01-12 15:48:45 -08:00
Joe Onorato
22284cfd09
Merge "Remove the volume slider in SystemUI." into honeycomb
2011-01-12 15:47:08 -08:00
Gilles Debunne
69c07d4b8d
am 95a95717: New menu_dropdown_panel assets.
...
* commit '95a9571702e64857e7d8d7dc6c8a46caec874a6b':
New menu_dropdown_panel assets.
2011-01-12 15:42:43 -08:00
Martijn Coenen
3e07c1af48
am 261fa998: am 25be5365: Implement canMakeReadonly().
...
* commit '261fa99890ebd1ea15a6067859b0e931a3009859':
Implement canMakeReadonly().
2011-01-12 15:31:07 -08:00
James Dong
9f59608946
am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
...
* commit '0569e58988bae5f08733e21e8d8adfa61fe89b7f':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
2011-01-12 15:31:01 -08:00
Nick Pelly
d6e0d942f2
am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
...
* commit '6b9db1d8c808439abc12d572283b7fab50fb5257':
Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-12 15:30:53 -08:00