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
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
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
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
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
Elliott Hughes
d1cf0545ad
Merge "Fix an off-by-one error."
2010-11-04 13:47:13 -07:00
Jason Sams
e8a5c362b9
Merge "Fix potental incremental build failure with leftover RS generated files."
2010-11-04 13:33:19 -07:00
Mike Lockwood
bec57dc3b6
Merge "MediaStore: Make definitions for Files table public"
2010-11-04 12:40:26 -07:00
Dianne Hackborn
2ff6030d58
Merge "StrictMode: now in more system server threads."
2010-11-04 12:21:48 -07:00
Romain Guy
b3c3196f49
Merge "Fix possible rendering issue when drawing a path."
2010-11-04 12:14:37 -07:00
Kenny Root
24e199a3a6
Merge "Add "nodpi" to DpiTest Android.mk"
2010-11-04 11:50:51 -07:00
Jamie Gennis
9842505c56
Merge "Fix a MediaBuffer leak in Stagefright."
2010-11-04 11:18:14 -07:00
Leon Scroggins
b4566b7fae
Merge "Use the new web email and password variations."
2010-11-04 11:11:42 -07:00
Xavier Ducrohet
5665469af7
Merge "Layoutlib native delegate: FloatMath."
2010-11-04 11:03:45 -07:00
Xavier Ducrohet
b153536f19
Merge "Layoutlib native delegate: path effects and xfermode."
2010-11-04 11:03:39 -07:00
Scott Main
2cdf9c7f24
am 13259f0b: am 17c87d80: Merge "docs: more revisions to the installing docs for GB" into gingerbread
...
* commit '13259f0ba08cde334a9b6760b20f14c269893652':
docs: more revisions to the installing docs for GB
2010-11-04 10:57:48 -07:00
Jean-Baptiste Queru
67265750c0
am 0d7c66b3: Merge 42c94791 from open-source master
...
* commit '0d7c66b3a555356315c17da48969fee28181ceda':
Fix the animation disappeared issue
2010-11-04 10:57:34 -07:00
Amith Yamasani
0a473c29e9
Merge "For extra large devices, use a dialog style for LauncherActivity."
2010-11-04 10:44:55 -07:00
James Dong
91e831b889
am c25c28a4: (-s ours) am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
...
* commit 'c25c28a496012f64da57f5beb3b99f7424abb602':
Revert "Support rotation in media recorder"
2010-11-04 10:32:06 -07:00
Scott Main
b78cf0aa81
am 974ea38a: am 42361551: Merge "docs: some more edits to the sdk install docs" into gingerbread
...
* commit '974ea38a7c941eb8d85cea3b9a2ab87ed0b8e592':
docs: some more edits to the sdk install docs
2010-11-04 10:29:14 -07:00
Mathias Agopian
ce51b99b82
am b20c2e7c: am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
...
* commit 'b20c2e7ca03f5ef2694b20ff9a7a10a7249eb936':
[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-04 10:29:09 -07:00
Hiroshi Lockheimer
8515b9cbab
am 0ce42c9d: (-s ours) am c181a082: Merge "Support rotation in media recorder" into gingerbread
...
* commit '0ce42c9d315ea6bf0e4f81b14b9e1a38f8979897':
Support rotation in media recorder
2010-11-04 10:29:05 -07:00
Gilles Debunne
ae64e5ba14
Merge "Tapping on paste popup with an empty clipboard does not crash in TextView."
2010-11-04 10:13:00 -07:00
Gilles Debunne
9aaa36b5c6
am 67e1ae5b: am 698dd812: Merge "ldpi assets created from hdpi in core." into gingerbread
...
* commit '67e1ae5b96bc3be5f9fc57350dada06194eb7f68':
ldpi assets created from hdpi in core.
2010-11-04 09:57:14 -07:00
Hiroshi Lockheimer
fb2be98105
am 5f5bcf50: am e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread
...
* commit '5f5bcf5039774050eec587dcc31905bd5a370b7b':
Squash ANRs in UsbStorageActivity.
2010-11-04 09:56:57 -07:00