Iain Merrick
|
702228b304
|
Merge "Make maybeSavePassword() a top-level method in BrowserFrame."
|
2010-11-22 09:34:31 -08:00 |
|
Erik
|
456cf7d222
|
Merge "b/3215774 Fix scrollMode notifications"
|
2010-11-21 20:08:06 -08:00 |
|
Joe Onorato
|
d5a7fe9fbc
|
Merge changes I61331a6e,I5728222b
* changes:
new battery assets
Use new nav button assets.
|
2010-11-21 19:23:36 -08:00 |
|
Dirk Dougherty
|
3b400b5deb
|
am e489d48f: am 805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
* commit 'e489d48f7c95b874ee7820d1052d862109244437':
doc change: Docs for SDK Tools r8, ADT 8
|
2010-11-19 19:21:04 -08:00 |
|
Wu-cheng Li
|
a84b8e4bc1
|
am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbread
* commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6':
Improve camera documentation.
|
2010-11-19 19:20:59 -08:00 |
|
Dirk Dougherty
|
fa2ef12b08
|
am 805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
* commit '805bddc123c1fc56be333d6ff365f168d4bc2b08':
doc change: Docs for SDK Tools r8, ADT 8
|
2010-11-19 19:04:56 -08:00 |
|
Dirk Dougherty
|
6063a4c77a
|
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
|
2010-11-19 19:03:03 -08:00 |
|
Wu-cheng Li
|
3dc42067f9
|
am 589e8381: Merge "Improve camera documentation." into gingerbread
* commit '589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
|
2010-11-19 18:17:24 -08:00 |
|
Wu-cheng Li
|
ced9b3525a
|
Merge "Improve camera documentation." into gingerbread
|
2010-11-19 18:14:43 -08:00 |
|
James Dong
|
aa171003b3
|
Merge "Fixed MediaPlayer unit test issues"
|
2010-11-19 17:35:26 -08:00 |
|
Mathias Agopian
|
a340dadd63
|
am d3b5510b: am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit 'd3b5510b8505c6c653469193a40f6431272085f3':
Fix SensorManager.getOrientation() documentation.
|
2010-11-19 17:23:13 -08:00 |
|
Mathias Agopian
|
7d27daed05
|
am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit '927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
|
2010-11-19 17:20:14 -08:00 |
|
Mathias Agopian
|
2a4743599b
|
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
|
2010-11-19 17:18:21 -08:00 |
|
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 |
|