Gil Dobjanschi
|
87fd9cf905
|
Merge "Added an export method without codec parameters."
|
2010-11-05 17:39:04 -07:00 |
|
Jeff Brown
|
306ae8b888
|
Merge "Rename the locked meta key constants for clarity."
|
2010-11-05 15:01:43 -07:00 |
|
Vasu Nori
|
0b80a4c2a3
|
Merge "fix broken build"
|
2010-11-05 14:49:37 -07:00 |
|
Mike Lockwood
|
2b02ada78d
|
Merge "MediaScanner: Fix mismatch between internal and external file paths."
|
2010-11-05 14:32:33 -07:00 |
|
Gilles Debunne
|
0c833aed62
|
Merge "Revert "Rationalized the single/multiple line initialization in TextViews.""
|
2010-11-05 14:21:28 -07:00 |
|
Dianne Hackborn
|
18a9342d12
|
Merge "Fix issue #3163426: Screen corruption when using the watermark feature"
|
2010-11-05 14:06:59 -07:00 |
|
Daniel Sandler
|
ea0fcda8eb
|
Merge "Show date in system bar."
|
2010-11-05 13:32:33 -07:00 |
|
Jeff Brown
|
d4ecee9313
|
Rename the locked meta key constants for clarity.
Also added some tests for LED setting.
Change-Id: I3fd86322afd07ae8de52d1ccbc2fae2c6d586641
|
2010-11-05 13:27:35 -07:00 |
|
Dan Bornstein
|
283397c469
|
am 10a43393: am 265acc50: am 05cc2d63: (-s ours) This class no longer exists.
* commit '10a433937895bff0d84f439a20a36fff97651cfd':
This class no longer exists.
|
2010-11-05 13:12:53 -07:00 |
|
Dan Bornstein
|
71a3c6efd8
|
am 73cd0c39: am 7dbeb24a: This class no longer exists.
* commit '73cd0c39bb1289704df3f3266ecedd3ed561d48c':
This class no longer exists.
|
2010-11-05 13:12:48 -07:00 |
|
Jim Miller
|
3feb4be833
|
Merge "Fix 3165868: Fix stall in state machine logic in WaveView"
|
2010-11-05 13:07:45 -07:00 |
|
shared_user android-merger-prebuild
|
c10d45c868
|
Merge commit '5de6d7a162f7b207e48a9078b9d0fe2700044976'
|
2010-11-05 13:03:37 -07:00 |
|
Dianne Hackborn
|
76c5fcd809
|
Merge "Adjust window animations to better match UX spec."
|
2010-11-05 12:52:19 -07:00 |
|
Vasu Nori
|
3e0381300b
|
Merge "Let cachefull-warning be under SQLiteDebug.DEBUG_SQL_CACHE flag"
|
2010-11-05 12:11:57 -07:00 |
|
Daniel Sandler
|
2bcdc0e294
|
Merge "Restore user-accessible lights-out control."
|
2010-11-05 12:11:48 -07:00 |
|
Adam Powell
|
ad39ad2b23
|
Merge "Fix bug 3167945 - list selection mode should persist across rotations"
|
2010-11-05 19:03:24 +00:00 |
|
Romain Guy
|
a1a131f668
|
Merge "Fix documentation HTML."
|
2010-11-05 18:58:21 +00:00 |
|
Amith Yamasani
|
acb9fad6c6
|
Merge "Adjust default screen timeout."
|
2010-11-05 18:26:27 +00:00 |
|
James Dong
|
e80fa29188
|
Merge "Use meta data in the media recording framework"
|
2010-11-05 18:18:30 +00:00 |
|
Vasu Nori
|
ed935d5917
|
Merge "address couple of review comments"
|
2010-11-05 18:12:04 +00:00 |
|
Gloria Wang
|
304c406266
|
Merge "Add support for WV DRM"
|
2010-11-05 17:45:26 +00:00 |
|
Daniel Sandler
|
5b31c138a7
|
Merge "Rotation lock bugfix."
|
2010-11-05 17:41:35 +00:00 |
|
Gilles Debunne
|
4b997c60be
|
Merge "Created missing assets by up/down scaling the one in other dpi"
|
2010-11-05 16:51:18 +00:00 |
|
Gilles Debunne
|
184de44c61
|
Merge "Created missing assets by up/down scaling the one in other dpi"
|
2010-11-05 16:51:01 +00:00 |
|
Ben Murdoch
|
575c297742
|
Merge "Work around race condition in CallBackProxy."
|
2010-11-05 10:12:21 +00:00 |
|
Vasu Nori
|
d8cc08dc41
|
Merge "add API to return Uri for the given downloaded file id & get mimetype"
|
2010-11-04 18:51:03 -07:00 |
|
Shimeng (Simon) Wang
|
acc3232fb9
|
Merge "Use minPrefWidth instead of viewsize.x."
|
2010-11-04 18:22:28 -07:00 |
|
Jason Sams
|
5e57e08ceb
|
Merge "More RS exceptions cleanup. Remove some dead code."
|
2010-11-04 18:21:45 -07:00 |
|
Gilles Debunne
|
8348f5f67f
|
Merge "Assets remove from bare drawable-xlarge directory."
|
2010-11-04 18:11:14 -07:00 |
|
Irfan Sheriff
|
4cb6ceca98
|
Merge "Initiate wake up scan only in a disconnected state"
|
2010-11-04 18:08:36 -07:00 |
|
Elliott Hughes
|
a692894ea1
|
Merge "Use InetAddress.isNumeric."
|
2010-11-04 17:50:15 -07:00 |
|
Dianne Hackborn
|
499fba9ebf
|
Merge "Rough cut at new window animations."
|
2010-11-04 17:32:07 -07:00 |
|
Dan Bornstein
|
7ac1ff2e16
|
am 265acc50: am 05cc2d63: (-s ours) This class no longer exists.
* commit '265acc5085ad03c4c043dd33faed808b55732134':
This class no longer exists.
|
2010-11-04 17:12:16 -07:00 |
|
Dan Bornstein
|
26fbc727b2
|
am 7dbeb24a: This class no longer exists.
* commit '7dbeb24a9fa950ec99fbcd8cbfcfdd8199de3d86':
This class no longer exists.
|
2010-11-04 17:12:10 -07:00 |
|
Gilles Debunne
|
f4b8b48b58
|
Merge "wallpaper moved to nodpi"
|
2010-11-04 17:10:10 -07:00 |
|
Robert Greenwalt
|
7d36fd09c3
|
Merge "Tell each VM to flush their DNS cache."
|
2010-11-04 17:02:44 -07:00 |
|
Brian Carlstrom
|
109b6b3b24
|
Merge "Fixing CloseGuard reported issue in WiredAccessoryObserver"
|
2010-11-04 16:46:05 -07:00 |
|
Dan Bornstein
|
a8aaf181b1
|
am 05cc2d63: (-s ours) This class no longer exists.
* commit '05cc2d635eba165098a8ff58678a2ef1db5ddd1a':
This class no longer exists.
|
2010-11-04 16:30:06 -07:00 |
|
Andrew Stadler
|
98f1b931af
|
Merge "Avoid NPE when reloading headers in single-pane mode"
|
2010-11-04 16:19:05 -07:00 |
|
Elliott Hughes
|
e0bc551ac3
|
Merge "Remove NetworkUtils.isIpAddress."
|
2010-11-04 16:09:04 -07:00 |
|
Gil Dobjanschi
|
fbda6a16dd
|
Merge "Added audio and video codec parameters to the export method."
|
2010-11-04 15:43:54 -07:00 |
|
Eric Rowe
|
54a77bd269
|
am 82fc12af: Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread
* commit '82fc12af416e351cb0a9d978734d585ab66d3f27':
DO NOT MERGE Add acceptPair method to BT stress.
|
2010-11-04 15:37:19 -07:00 |
|
Adam Powell
|
601e342d2a
|
Merge "Fix bug 3163150 - move holo extended themes to an overlay file."
|
2010-11-04 15:24:23 -07:00 |
|
Brian Carlstrom
|
b50d76971b
|
Merge "Add android.os.StrictMode.VmPolicy.Builder.detectLeakedClosableObjects API"
|
2010-11-04 15:12:31 -07:00 |
|
Eric Rowe
|
860417a853
|
Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread
|
2010-11-04 14:54:23 -07:00 |
|
Dmitry Shmidt
|
4ba3bbc80e
|
Merge "bugreport: Add bcm4329 internal counters dump"
|
2010-11-04 14:53:17 -07:00 |
|
Romain Guy
|
a29b13cfa9
|
Merge "Lines would not set the scissor before drawing."
|
2010-11-04 14:40:26 -07:00 |
|
Brian Carlstrom
|
45322d8f33
|
Merge "Integrate StrictMode with CloseGuard"
|
2010-11-04 14:32:33 -07:00 |
|
Daniel Sandler
|
4b3e3cc671
|
Merge "Rotation lock."
|
2010-11-04 14:15:56 -07:00 |
|
Chet Haase
|
d1e92d9a01
|
Merge "Adding JNI methods as a faster reflection mechanism"
|
2010-11-04 14:05:57 -07:00 |
|