Shimeng (Simon) Wang
badc41e772
Merge "Make sure we have a ";" after locale in User Agent"
2010-11-19 17:13:07 -08:00
Brad Fitzpatrick
3a2e2e044d
Merge "Don't re-read SharedPreferences unnecessarily."
2010-11-19 17:08:44 -08:00
Daniel Shiplacoff
92a6519b39
Merge "Updates assets for edge glow and line."
2010-11-19 17:00:25 -08:00
Scott Main
72ffb6c5cb
am 55ff5708: am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
...
* commit '55ff5708bb166ab985ffd89e62ddcb13927d6403':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
2010-11-19 16:56:53 -08:00
Jean-Baptiste Queru
9b99eb350e
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
...
* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
2010-11-19 16:56:49 -08:00
Jean-Baptiste Queru
6bca1b0809
am 7b76ed69: am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
...
* commit '7b76ed693e42caea0c5f1bcbe7059c580e9cb314':
Added noop unregisterReceiver to complement existing noop registerReceiver.
2010-11-19 16:56:42 -08:00
Jake Hamby
e27be5d088
Merge "Revert "Don't call cancel discovery when its already canceelled.""
2010-11-19 16:53:26 -08:00
Brian Muramatsu
7240174e54
Merge "Fix ClipboardManager#hasText"
2010-11-19 16:52:11 -08:00
Scott Main
08f93179ec
am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
...
* commit '828b68166679ebfc0002e2ea516ca91e6fb13597':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
2010-11-19 16:51:57 -08:00
James Dong
342f7fab44
Merge "Removed uncessary FILE structure pointer for I/O"
2010-11-19 16:49:10 -08:00
Scott Main
bff5e8c308
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
2010-11-19 16:48:50 -08:00
Brian Carlstrom
ce56191533
Merge "Adding CloseGuard to Animation to find forgotten animations"
2010-11-19 16:28:30 -08:00
Xavier Ducrohet
ef04af68f7
Merge "Layoutlib: support for editing embedded layouts."
2010-11-19 16:23:22 -08:00
Andy Stadler
fb3485e527
Merge "Fixes to DevicePolicyManager.setPasswordExpirationTimeout"
2010-11-19 16:22:31 -08:00
Jean-Baptiste Queru
f863896d52
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
...
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
2010-11-19 16:21:31 -08:00
Dianne Hackborn
b6ddb36d3c
Merge "Goodbye title_bar_shadow."
2010-11-19 16:04:53 -08:00
Eric Laurent
a115ee4084
Merge "Fix issue 3157123."
2010-11-19 15:58:24 -08:00
Jean-Baptiste Queru
1351c0e488
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
2010-11-19 15:50:29 -08:00
Jean-Baptiste Queru
4d43367eda
am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
...
* commit 'e3bef7c48d7ec13cb8c7c81dba8d775377e69bed':
Added noop unregisterReceiver to complement existing noop registerReceiver.
2010-11-19 15:43:28 -08:00
Jean-Baptiste Queru
e656aff671
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
2010-11-19 15:31:30 -08:00
Mike Lockwood
bdfddf16bc
Merge "CameraBrowser: temporarily move to system partition"
2010-11-19 14:56:07 -08:00
Dianne Hackborn
0ea2420fc3
Merge "Implement issue #2367442 : Please add API for manipulating installer package names"
2010-11-19 14:38:16 -08:00
Xavier Ducrohet
1d5a5e094a
Merge "LayoutLib: use the new expand API."
2010-11-19 14:33:58 -08:00
Jeff Brown
df44034c15
Merge "Fix SDK build on Windows due to use of mmap."
2010-11-19 13:57:34 -08:00
Jeff Brown
9ee93d18ed
Fix SDK build on Windows due to use of mmap.
...
Change-Id: Id4bd9a6f932285c93c5853e540efc20b99876564
2010-11-19 13:52:19 -08:00
Xavier Ducrohet
a56323747e
Merge "LayoutLib: fix some tests"
2010-11-19 12:59:29 -08:00
Mike Lockwood
ff0be2c71a
Merge "CameraBrowser improvements:"
2010-11-19 12:31:00 -08:00
Brad Fitzpatrick
4ec3460906
Merge "Fix AbsListView StrictMode.Span end point on flings."
2010-11-19 12:08:34 -08:00
Daniel Sandler
1f5e7f35d7
Merge "Improve hide/show animations in status bar."
2010-11-19 11:54:35 -08:00
Xavier Ducrohet
b4bbbced82
Merge "Layoutlib: support viewkey in include nodes."
2010-11-19 11:21:01 -08:00
Android Git Automerger
f4a099573e
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2010-11-19 11:10:11 -08:00
Brad Fitzpatrick
45748c30a6
Merge "StrictMode: use Log.isLoggable"
2010-11-19 11:07:47 -08:00
Gilles Debunne
b192bb443a
Merge "Clean-up in StaticLayout"
2010-11-19 11:07:15 -08:00
Mike Lockwood
5470cc95e3
Merge "PTP: Fix permissions problems with files imported via PTP"
2010-11-19 10:58:47 -08:00
Charles Chen
a79d54874e
Merge "Removing logs of text that is being spoken."
2010-11-19 10:56:45 -08:00
Dirk Dougherty
4608a78204
am 00f502a3: am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
...
* commit '00f502a38cc4d6e2278f962b04308e6590dba36b':
Doc change: update media formats table.
2010-11-19 10:56:26 -08:00
Dirk Dougherty
c512be40bb
am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
...
* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
Doc change: update media formats table.
2010-11-19 10:53:20 -08:00
Dirk Dougherty
daba254db2
Merge "Doc change: update media formats table." into gingerbread
2010-11-19 10:47:10 -08:00
Robert Greenwalt
bf0f1ce9cb
Merge "Notify all VMs when proxy changes."
2010-11-19 10:34:17 -08:00
Andreas Huber
cc24448135
Merge "Fix an artifact of going from off_t to off64_t"
2010-11-19 10:31:50 -08:00
Brad Fitzpatrick
3a56d0fbd0
am 096c4c44: am 251384a7: Merge "Improve performance when getting styled string."
...
* commit '096c4c448d8110c21108f2db4a19a85099e78557':
Improve performance when getting styled string.
2010-11-19 10:27:56 -08:00
Jean-Baptiste Queru
7528f2253a
am f69f356e: am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* inste
...
* commit 'f69f356ebaf33aa150817c44ee2bd781f24e4e71':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:27:51 -08:00
Brad Fitzpatrick
4175b01d51
am 251384a7: Merge "Improve performance when getting styled string."
...
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.
2010-11-19 10:25:09 -08:00
Jean-Baptiste Queru
414633971b
am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
...
* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:24:51 -08:00
Scott Main
1045860ed9
Merge "docs: de-'new' samples and tutorials"
2010-11-19 10:23:29 -08:00
Mike Lockwood
bd9b9495f2
Merge "Remove command line mtp host tool"
2010-11-19 10:22:09 -08:00
Irfan Sheriff
02aff907b5
Merge "Split SupplicantStateTracker and refactor"
2010-11-19 10:18:29 -08:00
Andreas Huber
c7e11f86e0
Merge "Squashed commit of the following:"
2010-11-19 10:07:28 -08:00
Kenny Root
38c37d60fa
Merge "Use different version of CLDR data in DatePicker"
2010-11-19 09:11:42 -08:00
Scott Main
1f99882a43
Merge "new docs for fragments"
2010-11-19 09:09:33 -08:00
