OSDN Git Service
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
Jason Sams [Fri, 21 Jan 2011 22:28:55 +0000 (14:28 -0800)]
Merge "fix bug
3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
Yu Shan Emily Lau [Fri, 21 Jan 2011 22:28:52 +0000 (14:28 -0800)]
am
588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
* commit '
588b1e4511d67f080449c3d49fd0d4bfc2bec79f':
Change the default ssid from GoogleGuest to the opennet for the power test.
Yu Shan Emily Lau [Fri, 21 Jan 2011 22:27:06 +0000 (14:27 -0800)]
Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
Nick Pelly [Fri, 21 Jan 2011 22:01:54 +0000 (14:01 -0800)]
resolved conflicts for merge of
3d06b1e0 to honeycomb-plus-aosp
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
Romain Guy [Fri, 21 Jan 2011 21:25:02 +0000 (13:25 -0800)]
am
d8b9d7cd: Merge "Don\'t set a Toast\'s view to null when enqueued several times. Bug #
3374386" into honeycomb
* commit '
d8b9d7cd1b2327b02e41edcddf94e64d481419d1':
Don't set a Toast's view to null when enqueued several times. Bug #
3374386
Romain Guy [Fri, 21 Jan 2011 21:23:25 +0000 (13:23 -0800)]
Merge "Don't set a Toast's view to null when enqueued several times. Bug #
3374386" into honeycomb
Andreas Huber [Fri, 21 Jan 2011 21:17:42 +0000 (13:17 -0800)]
am
05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
* commit '
05aa082770d812c5921d6b2f9b3559f1fd1536a8':
Some tweaks to HTTP live / nuplayer behaviour
Patrick Dubroy [Fri, 21 Jan 2011 21:15:37 +0000 (13:15 -0800)]
am
40c37043: Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb
* commit '
40c37043367f7cefd3467c41c57ec7be169b681f':
Update Bitmap.recycle() doc for heap-allocated pixel data
Andreas Huber [Fri, 21 Jan 2011 21:14:30 +0000 (13:14 -0800)]
Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
Patrick Dubroy [Fri, 21 Jan 2011 21:13:17 +0000 (13:13 -0800)]
Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb
Huahui Wu [Fri, 21 Jan 2011 21:05:24 +0000 (13:05 -0800)]
am
17d25c56: Merge "b/
3369602 Using Math.round() to convert float coordinates to integers." into honeycomb
* commit '
17d25c564da50cfdcef6705ccc592ced2bd7c960':
b/
3369602 Using Math.round() to convert float coordinates to integers.
Huahui Wu [Fri, 21 Jan 2011 21:03:49 +0000 (13:03 -0800)]
Merge "b/
3369602 Using Math.round() to convert float coordinates to integers." into honeycomb
Leon Scroggins [Fri, 21 Jan 2011 20:59:05 +0000 (12:59 -0800)]
am
d5188657: Do a better job of lining up text with page text.
* commit '
d5188657dcde0f40a6954a00d569c0575bf6095a':
Do a better job of lining up text with page text.
Jesse Wilson [Fri, 21 Jan 2011 20:36:24 +0000 (12:36 -0800)]
am
276677f2: Merge "Move URLTest tests to libcore." into honeycomb
* commit '
276677f2ac821e5eb8a7f6a4204242ee47501d6e':
Move URLTest tests to libcore.
Jason parks [Fri, 21 Jan 2011 20:36:20 +0000 (12:36 -0800)]
am
0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb
* commit '
0512d080a5ae7eccb154be4302aaf4b5fb8aa5a6':
Add and enforce the permission for encrypting/decrypting.
Jason parks [Fri, 21 Jan 2011 20:36:01 +0000 (12:36 -0800)]
am
0f2ef34b: Merge "Update encryption commands." into honeycomb
* commit '
0f2ef34b5a7158ab105edfb0d6c5904ae23e89fa':
Update encryption commands.
Jesse Wilson [Fri, 21 Jan 2011 20:13:11 +0000 (12:13 -0800)]
Merge "Move URLTest tests to libcore." into honeycomb
Jason parks [Fri, 21 Jan 2011 19:59:15 +0000 (11:59 -0800)]
Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb
Jason parks [Fri, 21 Jan 2011 19:39:15 +0000 (11:39 -0800)]
Merge "Update encryption commands." into honeycomb
Gilles Debunne [Fri, 21 Jan 2011 19:32:30 +0000 (11:32 -0800)]
am
4569f1a5: Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
* commit '
4569f1a561b4db77cc87f649e04c352415b65605':
Paste popup window is displayed on the side when it would be clipped on top of screen.
Gilles Debunne [Fri, 21 Jan 2011 19:29:39 +0000 (11:29 -0800)]
Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
Shimeng (Simon) Wang [Fri, 21 Jan 2011 18:47:35 +0000 (10:47 -0800)]
am
7633540c: Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb
* commit '
7633540cf0d1cfa1f893dc827cddaca3ea272af7':
Keep min/max zoom scale in proportion when zoom density changes.
Shimeng (Simon) Wang [Fri, 21 Jan 2011 18:45:22 +0000 (10:45 -0800)]
Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb
Andy Stadler [Fri, 21 Jan 2011 18:30:03 +0000 (10:30 -0800)]
am
c2ff2ec0: Merge "Read actual device encryption status" into honeycomb
* commit '
c2ff2ec0d987dd1372183d2a18ea59a0c4d71c2c':
Read actual device encryption status
Andy Stadler [Fri, 21 Jan 2011 18:27:46 +0000 (10:27 -0800)]
Merge "Read actual device encryption status" into honeycomb
Mathias Agopian [Fri, 21 Jan 2011 18:15:34 +0000 (10:15 -0800)]
am
4707dc73: am
72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
* commit '
4707dc73e236b7055644401b73cd30164b7ad157':
Fix the ISurfaceComposer onTransact switch.
Nick Pelly [Fri, 21 Jan 2011 17:41:40 +0000 (09:41 -0800)]
resolved conflicts for merge of
97ac2935 to honeycomb-plus-aosp
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350
Nick Pelly [Fri, 21 Jan 2011 17:29:13 +0000 (09:29 -0800)]
Merge "resolved conlifcts for merge of
8c1cd157 to "honeycomb-plus-aosp"" into honeycomb-plus-aosp
Justin Ho [Fri, 21 Jan 2011 17:20:42 +0000 (09:20 -0800)]
am
50065738: Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb
* commit '
500657387d834a8eb712e9c56bb00b64173cc1a9':
Integrating btn_dialog assets from Gingerbread
Justin Ho [Fri, 21 Jan 2011 17:18:17 +0000 (09:18 -0800)]
Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb
Nick Pelly [Fri, 21 Jan 2011 16:55:38 +0000 (08:55 -0800)]
resolved conlifcts for merge of
8c1cd157 to "honeycomb-plus-aosp"
Conflicts:
api/current.xml
Change-Id: Ib6556fa54f49d4b55719dae79662d54f1530e76e
Amith Yamasani [Fri, 21 Jan 2011 16:45:09 +0000 (08:45 -0800)]
am
672f4ef3: Merge "Sync activity picker to latest dialog style." into honeycomb
* commit '
672f4ef34801ddc788b2fe4ca41da58147ba1234':
Sync activity picker to latest dialog style.
Justin Ho [Fri, 21 Jan 2011 16:43:08 +0000 (08:43 -0800)]
am
09358f00: Integrating Gingerbread phone lockscreen assets
* commit '
09358f00fd87cd5a9fc143a0376c228f11881fa1':
Integrating Gingerbread phone lockscreen assets
Amith Yamasani [Fri, 21 Jan 2011 16:42:18 +0000 (08:42 -0800)]
Merge "Sync activity picker to latest dialog style." into honeycomb
Justin Ho [Fri, 21 Jan 2011 15:45:43 +0000 (07:45 -0800)]
am
6d495a67: Resized btn_radio buttons from Gingerbread for legacy apps
* commit '
6d495a67fcf52b3c2d99443ca25e4df6bceaf07a':
Resized btn_radio buttons from Gingerbread for legacy apps
satok [Fri, 21 Jan 2011 11:39:48 +0000 (03:39 -0800)]
am
6a0d924e: Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb
* commit '
6a0d924e61cdb03ba63e06aeb950b1e21f5bf72f':
Show implicitly enabled subtypes in the input method selection dialog
satok [Fri, 21 Jan 2011 11:37:49 +0000 (03:37 -0800)]
Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb
Santosh Madhava [Fri, 21 Jan 2011 07:46:27 +0000 (23:46 -0800)]
am
ff23e4d7: Merge "Fix for issue
3370052 : Export progress percentage is incorrect" into honeycomb
* commit '
ff23e4d7f872df4d5880e69cc3742fc08d66f00b':
Fix for issue
3370052 : Export progress percentage is incorrect
Santosh Madhava [Fri, 21 Jan 2011 07:46:23 +0000 (23:46 -0800)]
am
95788cf4: Merge "Fix for PR
3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
* commit '
95788cf478d177d6748c40d4ce725fb4f93aec82':
Fix for PR
3369866 : Project thumbnail should have the same aspect ratio
Santosh Madhava [Fri, 21 Jan 2011 07:44:29 +0000 (23:44 -0800)]
Merge "Fix for issue
3370052 : Export progress percentage is incorrect" into honeycomb
Santosh Madhava [Fri, 21 Jan 2011 07:44:05 +0000 (23:44 -0800)]
Merge "Fix for PR
3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
Shih-wei Liao [Fri, 21 Jan 2011 07:12:47 +0000 (23:12 -0800)]
am
f1f71053: Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb
* commit '
f1f710538e4d6388611145e66afc9dd934fa97cc':
Handle fatal errors from calling bccRegisterSymbolCallback (if any).
Shih-wei Liao [Fri, 21 Jan 2011 07:10:39 +0000 (23:10 -0800)]
Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb
Ken Wakasa [Fri, 21 Jan 2011 07:09:34 +0000 (23:09 -0800)]
am
ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb
* commit '
ccbdf5e838eb44a1920c2c02fcf4190880a3c540':
Update class doc for InputMethodSubtype
Ken Wakasa [Fri, 21 Jan 2011 07:07:53 +0000 (23:07 -0800)]
Merge "Update class doc for InputMethodSubtype" into honeycomb
Brad Fitzpatrick [Fri, 21 Jan 2011 06:26:50 +0000 (22:26 -0800)]
am
68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb
* commit '
6828656220f4ed5ae803e4c11fb75fb56bc3ea25':
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
Brad Fitzpatrick [Fri, 21 Jan 2011 06:24:18 +0000 (22:24 -0800)]
Merge "StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties" into honeycomb
satok [Fri, 21 Jan 2011 05:44:59 +0000 (21:44 -0800)]
am
0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
* commit '
0e5bf5051b02bc382fb7e6c975511af499b31624':
Show ime switch icon when there is a hard keyboard
Adam Cohen [Fri, 21 Jan 2011 05:42:45 +0000 (21:42 -0800)]
am
cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb
* commit '
cdd5626da62cb2dc013cded470e264232617f635':
Cleaning up some StackView bad behavior
Romain Guy [Fri, 21 Jan 2011 05:42:40 +0000 (21:42 -0800)]
am
99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb
* commit '
99d49118b857df4051a864b35254e275bc8a68b6':
Add support for drawBitmapMesh().