OSDN Git Service
Dianne Hackborn [Sun, 23 Jan 2011 20:03:16 +0000 (12:03 -0800)]
am
b149f5c8: Merge "Fix issue #
3302006: Cannot see the dialog lunched from a transparent activity." into honeycomb
* commit '
b149f5c8d29cda2f2e46559a68467be89714f737':
Fix issue #
3302006: Cannot see the dialog lunched from a transparent activity.
Romain Guy [Sun, 23 Jan 2011 20:01:15 +0000 (12:01 -0800)]
am
60559631: Merge "Collapse sucessive calls to restoreToCount() in display lists." into honeycomb
* commit '
6055963155450dff2c287d5568a5c4390d796f3a':
Collapse sucessive calls to restoreToCount() in display lists.
Dianne Hackborn [Sun, 23 Jan 2011 20:00:41 +0000 (12:00 -0800)]
Merge "Fix issue #
3302006: Cannot see the dialog lunched from a transparent activity." into honeycomb
Romain Guy [Sun, 23 Jan 2011 19:59:39 +0000 (11:59 -0800)]
Merge "Collapse sucessive calls to restoreToCount() in display lists." into honeycomb
Adam Powell [Sun, 23 Jan 2011 19:51:04 +0000 (11:51 -0800)]
am
b35672e4: Merge "Fix bug
3380299 - Update checkboxes to show checks." into honeycomb
* commit '
b35672e4ef5dfe9719c2ba4b088eceabab0fade8':
Fix bug
3380299 - Update checkboxes to show checks.
Adam Powell [Sun, 23 Jan 2011 19:44:55 +0000 (11:44 -0800)]
Merge "Fix bug
3380299 - Update checkboxes to show checks." into honeycomb
Romain Guy [Sun, 23 Jan 2011 19:35:41 +0000 (11:35 -0800)]
am
4cf6e2f3: Fix potential crash in display lists.
* commit '
4cf6e2f34994f160e1baba205a43c12784dd3e0d':
Fix potential crash in display lists.
Adam Powell [Sun, 23 Jan 2011 00:22:22 +0000 (16:22 -0800)]
am
41f42412: Fix bug
3380266 - Add searchview min width defaults for non-xlarge configurations
* commit '
41f4241240798be91adcff7181e5a3adf651da55':
Fix bug
3380266 - Add searchview min width defaults for non-xlarge configurations
Mike Lockwood [Sat, 22 Jan 2011 22:37:31 +0000 (14:37 -0800)]
am
2d044d1f: Merge "Remove MTP related log spam" into honeycomb
* commit '
2d044d1ff9d5d51eba9669857b7d5ea4e9c2ac52':
Remove MTP related log spam
Mike Lockwood [Sat, 22 Jan 2011 22:35:39 +0000 (14:35 -0800)]
Merge "Remove MTP related log spam" into honeycomb
Dianne Hackborn [Sat, 22 Jan 2011 21:09:01 +0000 (13:09 -0800)]
am
f36af164: Merge "Whoops, actually exclude pre-HC apps." into honeycomb
* commit '
f36af16479e252bec168ed181885ec21d9df46f5':
Whoops, actually exclude pre-HC apps.
Dianne Hackborn [Sat, 22 Jan 2011 21:06:48 +0000 (13:06 -0800)]
Merge "Whoops, actually exclude pre-HC apps." into honeycomb
Dianne Hackborn [Sat, 22 Jan 2011 19:51:40 +0000 (11:51 -0800)]
am
5503d803: Merge "Fix issue #
3377999: Activities need to be stopped when sleeping" into honeycomb
* commit '
5503d803ecee63d417128d3849717b59b971fc08':
Fix issue #
3377999: Activities need to be stopped when sleeping
Dianne Hackborn [Sat, 22 Jan 2011 19:38:48 +0000 (11:38 -0800)]
Merge "Fix issue #
3377999: Activities need to be stopped when sleeping" into honeycomb
Romain Guy [Sat, 22 Jan 2011 08:41:16 +0000 (00:41 -0800)]
am
b2ee64ed: Merge "Fix regression with hardware layers." into honeycomb
* commit '
b2ee64edffe3dfe7316baa435566f777e657d9a0':
Fix regression with hardware layers.
Romain Guy [Sat, 22 Jan 2011 08:39:16 +0000 (00:39 -0800)]
Merge "Fix regression with hardware layers." into honeycomb
Dirk Dougherty [Sat, 22 Jan 2011 06:27:07 +0000 (22:27 -0800)]
am
794e8867: Merge "doc change: update glibc/ubuntu min req for sdk. Add info about emulator performance." into honeycomb
* commit '
794e886715143e2c48c9f69ed1adc2517a5541b1':
doc change: update glibc/ubuntu min req for sdk. Add info about emulator performance.
Dirk Dougherty [Sat, 22 Jan 2011 06:24:42 +0000 (22:24 -0800)]
Merge "doc change: update glibc/ubuntu min req for sdk. Add info about emulator performance." into honeycomb
Jaikumar Ganesh [Sat, 22 Jan 2011 05:26:40 +0000 (21:26 -0800)]
am
8db58ea5: Merge "Connect other profiles when priority is auto connect." into honeycomb
* commit '
8db58ea52c618337fa91289aa42572599d58dafc':
Connect other profiles when priority is auto connect.
Jaikumar Ganesh [Sat, 22 Jan 2011 05:24:49 +0000 (21:24 -0800)]
Merge "Connect other profiles when priority is auto connect." into honeycomb
Romain Guy [Sat, 22 Jan 2011 05:18:06 +0000 (21:18 -0800)]
am
acf36126: Merge "Log only 1 line per process when using OpenGLRenderer." into honeycomb
* commit '
acf36126e4620a0cc36d4e5b1268d15777ea4361':
Log only 1 line per process when using OpenGLRenderer.
Romain Guy [Sat, 22 Jan 2011 05:15:40 +0000 (21:15 -0800)]
Merge "Log only 1 line per process when using OpenGLRenderer." into honeycomb
Robert Ly [Sat, 22 Jan 2011 05:07:43 +0000 (21:07 -0800)]
am
baf5e768: Doc change: adding sample links
* commit '
baf5e7683e83fee8aac5ef0e5aadc55dfd177f9a':
Doc change: adding sample links
Jesse Wilson [Sat, 22 Jan 2011 03:31:17 +0000 (19:31 -0800)]
am
3a27acef: Merge "Update preloaded-classes for Honeycomb." into honeycomb
* commit '
3a27acef4e72d80bbbe0618b50785a2945ef4910':
Update preloaded-classes for Honeycomb.
Jesse Wilson [Sat, 22 Jan 2011 03:29:22 +0000 (19:29 -0800)]
Merge "Update preloaded-classes for Honeycomb." into honeycomb
Scott Main [Sat, 22 Jan 2011 03:15:53 +0000 (19:15 -0800)]
am
d8ea604b: Merge "add note about emulator performance" into honeycomb
* commit '
d8ea604b7ec4d1e0e16fc4a9a6bd5d01a499a0ed':
add note about emulator performance
Justin Ho [Sat, 22 Jan 2011 03:13:42 +0000 (19:13 -0800)]
am
23783dcd: Merge "Updated ic_sysbar menu asset" into honeycomb
* commit '
23783dcd212cbbc51c623a65fd5628ad6235570f':
Updated ic_sysbar menu asset
Scott Main [Sat, 22 Jan 2011 03:13:38 +0000 (19:13 -0800)]
Merge "add note about emulator performance" into honeycomb
Justin Ho [Sat, 22 Jan 2011 03:13:37 +0000 (19:13 -0800)]
am
b132d8c9: Merge "Updated IME asset" into honeycomb
* commit '
b132d8c9b1b48c99b35f58b1621bffdc5ade1564':
Updated IME asset
Justin Ho [Sat, 22 Jan 2011 03:11:56 +0000 (19:11 -0800)]
Merge "Updated ic_sysbar menu asset" into honeycomb
Justin Ho [Sat, 22 Jan 2011 03:11:15 +0000 (19:11 -0800)]
Merge "Updated IME asset" into honeycomb
Romain Guy [Sat, 22 Jan 2011 03:04:17 +0000 (19:04 -0800)]
am
596ba2fa: Merge "Correctly invalidate views that transition from opaque to non-opaque. Bug #
3337037" into honeycomb
* commit '
596ba2fa791db7ae671bd79c346b54a7ea2f8113':
Correctly invalidate views that transition from opaque to non-opaque. Bug #
3337037
Romain Guy [Sat, 22 Jan 2011 03:02:05 +0000 (19:02 -0800)]
Merge "Correctly invalidate views that transition from opaque to non-opaque. Bug #
3337037" into honeycomb
Scott Main [Sat, 22 Jan 2011 02:51:04 +0000 (18:51 -0800)]
am
fa9d452b: Merge "update sidenav, fix typos" into honeycomb
* commit '
fa9d452b45a6c10666ff5d36bfbac8da37f33ac5':
update sidenav, fix typos
Bart Sears [Sat, 22 Jan 2011 02:48:59 +0000 (18:48 -0800)]
am
e2ff529b: Merge "b/
3377597 Improve zooming performance." into honeycomb
* commit '
e2ff529b3f69a3d2ccd55e283f3d0e446a087ed6':
b/
3377597 Improve zooming performance.
Scott Main [Sat, 22 Jan 2011 02:48:58 +0000 (18:48 -0800)]
Merge "update sidenav, fix typos" into honeycomb
Bart Sears [Sat, 22 Jan 2011 02:47:13 +0000 (18:47 -0800)]
Merge "b/
3377597 Improve zooming performance." into honeycomb
Scott Main [Sat, 22 Jan 2011 02:28:35 +0000 (18:28 -0800)]
am
a3c3b842: Merge "more revisions to getting started; add emulator issues" into honeycomb
* commit '
a3c3b8426047d7e8b50fe6db6edccf821e601d00':
more revisions to getting started; add emulator issues
Scott Main [Sat, 22 Jan 2011 02:26:53 +0000 (18:26 -0800)]
Merge "more revisions to getting started; add emulator issues" into honeycomb
Adam Powell [Sat, 22 Jan 2011 02:20:20 +0000 (18:20 -0800)]
am
cd862c44: Merge "Fix bug
3360851 - actionbar overflow menu button doesn\'t trigger "audible selection"" into honeycomb
* commit '
cd862c44d951a743e19c56023b127b8c418fb0a1':
Fix bug
3360851 - actionbar overflow menu button doesn't trigger "audible selection"
Adam Powell [Sat, 22 Jan 2011 02:18:00 +0000 (18:18 -0800)]
Merge "Fix bug
3360851 - actionbar overflow menu button doesn't trigger "audible selection"" into honeycomb
Adam Cohen [Sat, 22 Jan 2011 02:14:00 +0000 (18:14 -0800)]
am
a049fe95: Merge "Fixing a couple StackView bugs:" into honeycomb
* commit '
a049fe95cdf68c73f104420433610d8a8a8a7357':
Fixing a couple StackView bugs:
Adam Cohen [Sat, 22 Jan 2011 02:12:15 +0000 (18:12 -0800)]
Merge "Fixing a couple StackView bugs:" into honeycomb
Adam Powell [Sat, 22 Jan 2011 02:10:48 +0000 (18:10 -0800)]
am
3024a5a5: Merge "Fix bug
3374664 - Action bar spacing between tabs, spinners and titles should be 32 dip" into honeycomb
* commit '
3024a5a54f09a1861ee85a5e2785b1cf8a70de39':
Fix bug
3374664 - Action bar spacing between tabs, spinners and titles should be 32 dip
Adam Powell [Sat, 22 Jan 2011 02:08:51 +0000 (18:08 -0800)]
Merge "Fix bug
3374664 - Action bar spacing between tabs, spinners and titles should be 32 dip" into honeycomb
Scott Main [Sat, 22 Jan 2011 02:02:31 +0000 (18:02 -0800)]
am
e2ba0dfe: remove link to revisions
* commit '
e2ba0dfef1e58a223d3d61fbf742b2d986ea8b1e':
remove link to revisions
Scott Main [Sat, 22 Jan 2011 02:00:28 +0000 (18:00 -0800)]
am
d41ff8e1: docs: update the honeycomb preview version notes
* commit '
d41ff8e1a4ae67ff01c2bb427949ff317871f7db':
docs: update the honeycomb preview version notes
Dave Sparks [Sat, 22 Jan 2011 01:33:59 +0000 (17:33 -0800)]
am
b6e89aff: (-s ours) am
65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit '
b6e89affd5d119f40e5c8a40f2d4f29ca5e534ca':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
Mathias Agopian [Sat, 22 Jan 2011 01:33:54 +0000 (17:33 -0800)]
am
b703d338: am
822d4ce6: Merge "fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
* commit '
b703d338c3b940de1bc45554116e20975145548d':
fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
Jeff Brown [Sat, 22 Jan 2011 01:33:48 +0000 (17:33 -0800)]
am
9cc55346: (-s ours) am
d0725eef: Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
* commit '
9cc55346ecb1c1f35760a71b5f3cdaebd02892e6':
Never drag scroll views with no children. (DO NOT MERGE)
Dianne Hackborn [Sat, 22 Jan 2011 00:46:35 +0000 (16:46 -0800)]
am
3a56ce3a: Merge "Fix some error messages, turn off logging." into honeycomb
* commit '
3a56ce3ab30a72c359bf64cf75bdce6ab03f2b7a':
Fix some error messages, turn off logging.
Dianne Hackborn [Sat, 22 Jan 2011 00:45:27 +0000 (16:45 -0800)]
Merge "Fix some error messages, turn off logging." into honeycomb
Adam Powell [Sat, 22 Jan 2011 00:24:13 +0000 (16:24 -0800)]
am
84fbff12: Merge "Fix bug
3374792 - Default holo dark activity background is badly dithered at full size" into honeycomb
* commit '
84fbff1299880c56c8f12a09b1a432ffa9aabfd9':
Fix bug
3374792 - Default holo dark activity background is badly dithered at full size
Fabrice Di Meglio [Sat, 22 Jan 2011 00:22:01 +0000 (16:22 -0800)]
am
9e2fa7a5: Merge "Fix bug #
3338957 (Account Picker and Account type picker need love)" into honeycomb
* commit '
9e2fa7a5b6a91bae3897e921d8c21557c2feb714':
Fix bug #
3338957 (Account Picker and Account type picker need love)
Scott Main [Sat, 22 Jan 2011 00:21:57 +0000 (16:21 -0800)]
am
5b5cbbf8: Merge "Doc change: fixing links and code indents" into honeycomb
* commit '
5b5cbbf8570a81d3604d1260f559d9d543e8e4bf':
Doc change: fixing links and code indents
Adam Powell [Sat, 22 Jan 2011 00:21:37 +0000 (16:21 -0800)]
Merge "Fix bug
3374792 - Default holo dark activity background is badly dithered at full size" into honeycomb
Fabrice Di Meglio [Sat, 22 Jan 2011 00:20:37 +0000 (16:20 -0800)]
Merge "Fix bug #
3338957 (Account Picker and Account type picker need love)" into honeycomb
Scott Main [Sat, 22 Jan 2011 00:19:56 +0000 (16:19 -0800)]
Merge "Doc change: fixing links and code indents" into honeycomb
Carl Shapiro [Sat, 22 Jan 2011 00:13:29 +0000 (16:13 -0800)]
am
76afe3e5: Merge "Remove dead code referencing an obsolete interface." into honeycomb
* commit '
76afe3e5cdf3a531835d349a6ab04f2fe82e3958':
Remove dead code referencing an obsolete interface.
Mathias Agopian [Sat, 22 Jan 2011 00:11:57 +0000 (16:11 -0800)]
am
48d1432e: am
a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
* commit '
48d1432e2762471f77ac03c6c639a17e2dde4467':
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
Carl Shapiro [Sat, 22 Jan 2011 00:11:40 +0000 (16:11 -0800)]
Merge "Remove dead code referencing an obsolete interface." into honeycomb
Andreas Huber [Sat, 22 Jan 2011 00:04:56 +0000 (16:04 -0800)]
am
66e35c24: (-s ours) am
e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
* commit '
66e35c240e6105934e76cabfafed385f95f013ba':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
Adam Powell [Fri, 21 Jan 2011 23:49:46 +0000 (15:49 -0800)]
Merge "Fix bug
3362680 - calendar crash while tabbing among views" into honeycomb
Jaikumar Ganesh [Fri, 21 Jan 2011 23:43:42 +0000 (15:43 -0800)]
Merge "Temporary Changes for certification of SCO." into honeycomb
Nick Pelly [Fri, 21 Jan 2011 23:30:32 +0000 (15:30 -0800)]
resolved conflicts for merge of
e5099cd3 to honeycomb-plus-aosp
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
Adam Powell [Fri, 21 Jan 2011 23:52:12 +0000 (15:52 -0800)]
am
5fc3c84f: Merge "Fix bug
3362680 - calendar crash while tabbing among views" into honeycomb
* commit '
5fc3c84f5c465d3f0f435037bd5b92fa8da1f2c2':
Fix bug
3362680 - calendar crash while tabbing among views
Nick Pelly [Fri, 21 Jan 2011 23:50:54 +0000 (15:50 -0800)]
am
82160444: am
50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
* commit '
8216044435d066a6279d1a733b919156bdc9325f':
Support for TagLostException (API).
Brad Fitzpatrick [Fri, 21 Jan 2011 23:50:45 +0000 (15:50 -0800)]
am
6b2b053b: am
597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
* commit '
6b2b053b5adf2d4f8f0defde58310a51dfb7e1e0':
Watchdog can get deadlocked on activity manager
Nick Pelly [Fri, 21 Jan 2011 23:50:20 +0000 (15:50 -0800)]
am
ccc9a9e5: am
b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
* commit '
ccc9a9e58247d174d587dee465868a948a07364f':
Fix javadoc which broke build.
Eric Laurent [Fri, 21 Jan 2011 23:47:56 +0000 (15:47 -0800)]
Merge "resolved conflicts for merge of
9ffe8338 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Eric Laurent [Fri, 21 Jan 2011 23:46:05 +0000 (15:46 -0800)]
resolved conflicts for merge of
9ffe8338 to honeycomb-plus-aosp
Change-Id: I0fe9b61a2003566f7d66189a9d83ad5dd879fd7a
Jaikumar Ganesh [Fri, 21 Jan 2011 23:45:54 +0000 (15:45 -0800)]
am
c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
* commit '
c4cc3ea48add3b7a63a1a97fc3a4c89b24217604':
Temporary Changes for certification of SCO.
Jeff Brown [Fri, 21 Jan 2011 23:31:38 +0000 (15:31 -0800)]
am
75a0e448: Merge "Optimize call to drawBitmap during screen rotation." into honeycomb
* commit '
75a0e44831d08d9cbfec9f150be4e78b2d1aabf5':
Optimize call to drawBitmap during screen rotation.
Jeff Brown [Fri, 21 Jan 2011 23:31:31 +0000 (15:31 -0800)]
am
cab11490: Merge "Reduce number of calls to updateInputWindows by 60%." into honeycomb
* commit '
cab114906df621d77bf59d9492f89182e34cd3e4':
Reduce number of calls to updateInputWindows by 60%.
Jeff Brown [Fri, 21 Jan 2011 23:29:46 +0000 (15:29 -0800)]
Merge "Optimize call to drawBitmap during screen rotation." into honeycomb
Jeff Brown [Fri, 21 Jan 2011 23:29:39 +0000 (15:29 -0800)]
Merge "Reduce number of calls to updateInputWindows by 60%." into honeycomb
Carl Shapiro [Fri, 21 Jan 2011 23:12:14 +0000 (15:12 -0800)]
am
8dac54c5: Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
* commit '
8dac54c5855cdb3334ea31ff1b5f04972515ff7f':
Perform orthogonal rotations without using a Skia canvas.
Carl Shapiro [Fri, 21 Jan 2011 23:09:56 +0000 (15:09 -0800)]
Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
Carl Shapiro [Fri, 21 Jan 2011 23:08:04 +0000 (15:08 -0800)]
am
366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb
* commit '
366d15d5425aaa090d9c1a1d7273f13e2c85c43b':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
Carl Shapiro [Fri, 21 Jan 2011 23:05:26 +0000 (15:05 -0800)]
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."" into honeycomb
Nick Pelly [Fri, 21 Jan 2011 23:03:19 +0000 (15:03 -0800)]
am
4d3ac03a: am
e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
* commit '
4d3ac03ade6184504ad3881def5e86133ae5f2f6':
hange the default IsoDep timeout to 300ms (docs update).
Mathias Agopian [Fri, 21 Jan 2011 23:02:26 +0000 (15:02 -0800)]
am
b92a40eb: am
12d014fd: Merge "fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
* commit '
b92a40ebfaf49783f942b75b413e1499e149c3bb':
fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
Amith Yamasani [Fri, 21 Jan 2011 23:02:18 +0000 (15:02 -0800)]
am
7c93e52f: (-s ours) am
68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
* commit '
7c93e52fac25fb76a67a82f1ccaa4ff6ad42e6ed':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
Gilles Debunne [Fri, 21 Jan 2011 22:55:50 +0000 (14:55 -0800)]
am
b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
* commit '
b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
Tapping inside an EditText should always pop up the IME.
Gilles Debunne [Fri, 21 Jan 2011 22:53:44 +0000 (14:53 -0800)]
Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
Amith Yamasani [Fri, 21 Jan 2011 22:49:34 +0000 (14:49 -0800)]
am
b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
* commit '
b58b5db4ba8edc075f6524df200aa8d3c678e267':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
Michael Kolb [Fri, 21 Jan 2011 22:49:30 +0000 (14:49 -0800)]
am
debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
* commit '
debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
Add public API for on screen zoom controls
Amith Yamasani [Fri, 21 Jan 2011 22:47:32 +0000 (14:47 -0800)]
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
Michael Kolb [Fri, 21 Jan 2011 22:47:30 +0000 (14:47 -0800)]
Merge "Add public API for on screen zoom controls" into honeycomb
Andreas Huber [Fri, 21 Jan 2011 22:44:21 +0000 (14:44 -0800)]
am
63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb
* commit '
63d64a14790ae21db31b60747864b4a7565b33c3':
Properly rotate video that's marked as such and decoded to a surface.
Andreas Huber [Fri, 21 Jan 2011 22:42:22 +0000 (14:42 -0800)]
Merge "Properly rotate video that's marked as such and decoded to a surface." into honeycomb
Irfan Sheriff [Fri, 21 Jan 2011 22:37:14 +0000 (14:37 -0800)]
am
ef76b830: am
4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
* commit '
ef76b8306fd6147d9dd7e3b7dce10354eff8033c':
Do not add unsolicited events to queue
Jeff Brown [Fri, 21 Jan 2011 22:37:07 +0000 (14:37 -0800)]
am
b26c516c: (-s ours) am
41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
* commit '
b26c516c03beffaf60460d3589b3807c0799c344':
Filter virtual keys after touches. (DO NOT MERGE)
Brad Fitzpatrick [Fri, 21 Jan 2011 22:36:54 +0000 (14:36 -0800)]
am
02bbbc11: am
069e810c: Merge "Fixing memory leak in PreferenceScreen."
* commit '
02bbbc1122eac6ab02c10c3c1bb34092914e3743':
Fixing memory leak in PreferenceScreen.
Brad Fitzpatrick [Fri, 21 Jan 2011 22:36:43 +0000 (14:36 -0800)]
am
4bb180d6: am
ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
* commit '
4bb180d62f71658d04a7d6800707de83c10b01a5':
frameworks/base: remove redundant code in WindowManager
Martijn Coenen [Fri, 21 Jan 2011 22:36:33 +0000 (14:36 -0800)]
am
c4eee776: am
07e6f616: Check NDEF before calling makeReadOnly().
* commit '
c4eee776ad9d3de99032984fe20f5de395888bc7':
Check NDEF before calling makeReadOnly().
Nick Pelly [Fri, 21 Jan 2011 22:34:03 +0000 (14:34 -0800)]
Merge "resolved conflicts for merge of
3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Leon Scroggins [Fri, 21 Jan 2011 22:33:03 +0000 (14:33 -0800)]
am
60130138: Merge "Restart input when the webpage changes the text." into honeycomb
* commit '
6013013829d1f97970d3ed426006d2522303826f':
Restart input when the webpage changes the text.
Jason Sams [Fri, 21 Jan 2011 22:30:56 +0000 (14:30 -0800)]
am
8418474d: Merge "fix bug
3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
* commit '
8418474dab412596c44c71497c0f4a3c39de597e':
fix bug
3375251 Copying arrays of objects would generate an exception due to excessive internal type checking.
Leon Scroggins [Fri, 21 Jan 2011 22:30:50 +0000 (14:30 -0800)]
Merge "Restart input when the webpage changes the text." into honeycomb
OSDN Git Service
