OSDN Git Service
Ashish Sharma [Tue, 1 Feb 2011 01:32:40 +0000 (17:32 -0800)]
Merge "Fix a minor documentation bug in TrafficStats."
Svetoslav Ganov [Tue, 1 Feb 2011 00:19:07 +0000 (16:19 -0800)]
am
b5d9b6ae: am
1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
* commit '
b5d9b6aec8565b13c45ce875d7e7b8e3ea3648f9':
Set time dialog display changes AM/PM at 1 instead of 12
Adam Powell [Tue, 1 Feb 2011 00:19:04 +0000 (16:19 -0800)]
am
3c7a6174: am
5f639d5a: Merge "Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
* commit '
3c7a617455410c3c164f9aeac522baa94e056651':
Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode
Svetoslav Ganov [Tue, 1 Feb 2011 00:15:26 +0000 (16:15 -0800)]
am
1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
* commit '
1c91433f7c61860319fa5d524b503c2631a7f2d3':
Set time dialog display changes AM/PM at 1 instead of 12
Adam Powell [Tue, 1 Feb 2011 00:15:20 +0000 (16:15 -0800)]
am
5f639d5a: Merge "Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
* commit '
5f639d5a5134b994ee77207ac931bdafe95c6d66':
Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode
Svetoslav Ganov [Tue, 1 Feb 2011 00:11:59 +0000 (16:11 -0800)]
Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
Adam Powell [Tue, 1 Feb 2011 00:11:51 +0000 (16:11 -0800)]
Merge "Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
Gilles Debunne [Mon, 31 Jan 2011 23:46:56 +0000 (15:46 -0800)]
am
e19246a3: am
11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
* commit '
e19246a38b76645bde43858945e78fcd2370b394':
Hint text is visible when using center gravity.
Dianne Hackborn [Mon, 31 Jan 2011 23:46:05 +0000 (15:46 -0800)]
am
8a92eeb8: (-s ours) am
13684548: (-s ours) am
e6c6b760: DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
* commit '
8a92eeb8d8b27486d81089bfba5f51945ad89b21':
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Raphael [Mon, 31 Jan 2011 23:46:00 +0000 (15:46 -0800)]
am
60e1eb4b: am
03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
* commit '
60e1eb4bfa6205cb2b307f9d2e9858f6e8cbb7ca':
LayoutLib.Create: support Outer_Inner_Delegate renaming.
Justin Ho [Mon, 31 Jan 2011 23:45:55 +0000 (15:45 -0800)]
am
c15d7f63: am
53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
* commit '
c15d7f63f047149e3fee0f2fc57539fb32856260':
Updated fallback sound for Honeycomb tablet
Jamie Gennis [Mon, 31 Jan 2011 23:40:06 +0000 (15:40 -0800)]
Merge "Clear all EGL errors when entering EGL funcs."
Gilles Debunne [Mon, 31 Jan 2011 23:32:40 +0000 (15:32 -0800)]
am
11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
* commit '
11f9647e03d4e1141bc4312626c8dc9116f1f470':
Hint text is visible when using center gravity.
Gilles Debunne [Mon, 31 Jan 2011 23:29:56 +0000 (15:29 -0800)]
Merge "Hint text is visible when using center gravity." into honeycomb
Jamie Gennis [Mon, 31 Jan 2011 23:02:46 +0000 (15:02 -0800)]
am
9abd7a33: am
b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
* commit '
9abd7a33009567a5f0da090fbf96f9cde389a7b8':
Add SurfaceTexture docs for getTransformMatrix.
Jean-Baptiste Queru [Mon, 31 Jan 2011 23:01:25 +0000 (15:01 -0800)]
Jamie Gennis [Mon, 31 Jan 2011 23:01:21 +0000 (15:01 -0800)]
am
cf675303: am
8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
* commit '
cf675303927d8008c5952759d534dcc6c0ca3d4a':
Fix a multithreading bug in libagl's EGL.
Dianne Hackborn [Mon, 31 Jan 2011 23:01:16 +0000 (15:01 -0800)]
am
723453a7: am
e9da0c1d: Merge "Fix issue #
3408542: "resizeable" attribute required to get out of compat mode" into honeycomb
* commit '
723453a7a77180b47720d3b5e8a9752349b77e2f':
Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Gilles Debunne [Mon, 31 Jan 2011 23:01:01 +0000 (15:01 -0800)]
am
ed6f13c4: am
c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
* commit '
ed6f13c4bd06dc4ef971cb720b8880ab1df3905a':
Tabs are resized to make sure they fit in their parent.
Dianne Hackborn [Mon, 31 Jan 2011 22:38:24 +0000 (14:38 -0800)]
am
13684548: (-s ours) am
e6c6b760: DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
* commit '
1368454815aaf793fe32ba32473fd11cf7b02e0d':
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Dianne Hackborn [Mon, 31 Jan 2011 22:36:02 +0000 (14:36 -0800)]
am
e6c6b760: DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
* commit '
e6c6b760eb0c1068fdfa656007ec27e482313b58':
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Raphael [Mon, 31 Jan 2011 22:32:56 +0000 (14:32 -0800)]
am
03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
* commit '
03245a8ec46acc7c2b24d3d680ea5b88bd89ce13':
LayoutLib.Create: support Outer_Inner_Delegate renaming.
Justin Ho [Mon, 31 Jan 2011 22:32:52 +0000 (14:32 -0800)]
am
53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
* commit '
53fe1045717163a227041643852a25dbcd4bc2b5':
Updated fallback sound for Honeycomb tablet
Raphael [Mon, 31 Jan 2011 22:30:28 +0000 (14:30 -0800)]
Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
Justin Ho [Mon, 31 Jan 2011 22:26:20 +0000 (14:26 -0800)]
Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
Jamie Gennis [Mon, 31 Jan 2011 22:14:50 +0000 (14:14 -0800)]
am
b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
* commit '
b799314e64d5afe050aeee394f0c29d7728c1e22':
Add SurfaceTexture docs for getTransformMatrix.
Mike Lockwood [Mon, 31 Jan 2011 22:13:30 +0000 (14:13 -0800)]
Merge "MTP: Use ro.product.manufacturer system property value for MTP manufacturer name"
Jamie Gennis [Mon, 31 Jan 2011 22:11:26 +0000 (14:11 -0800)]
Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
Jamie Gennis [Mon, 31 Jan 2011 00:50:04 +0000 (16:50 -0800)]
Clear all EGL errors when entering EGL funcs.
This changes the clearError function in the EGL wrapper layer to simply
call eglGetError(). That should clear any pending errors from all the
underlying EGL implementations, which is needed to correctly report the
error for the most recently called EGL function.
Change-Id: Iad19c69f0c5305e873f3c2f96d353280d31f7b61
Jean-Baptiste Queru [Mon, 31 Jan 2011 22:00:52 +0000 (14:00 -0800)]
Jamie Gennis [Mon, 31 Jan 2011 21:56:28 +0000 (13:56 -0800)]
am
8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
* commit '
8df2c42413cfdde1c4290b4797a09c4bafb6c3bc':
Fix a multithreading bug in libagl's EGL.
Dianne Hackborn [Mon, 31 Jan 2011 21:56:24 +0000 (13:56 -0800)]
am
e9da0c1d: Merge "Fix issue #
3408542: "resizeable" attribute required to get out of compat mode" into honeycomb
* commit '
e9da0c1de179e3cdb2d3709bde2b5cb6eb192230':
Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Gilles Debunne [Mon, 31 Jan 2011 21:56:21 +0000 (13:56 -0800)]
am
c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
* commit '
c1eb127f4e19c1f86e4b18c2c1daebe2404eeb93':
Tabs are resized to make sure they fit in their parent.
Jamie Gennis [Mon, 31 Jan 2011 21:38:27 +0000 (13:38 -0800)]
Merge "Fix a multithreading bug in libagl's EGL." into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 21:37:50 +0000 (13:37 -0800)]
Merge "Fix issue #
3408542: "resizeable" attribute required to get out of compat mode" into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:03:59 +0000 (12:03 -0800)]
Gilles Debunne [Mon, 31 Jan 2011 20:01:34 +0000 (12:01 -0800)]
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:55:40 +0000 (11:55 -0800)]
Daniel Sandler [Mon, 31 Jan 2011 19:54:05 +0000 (11:54 -0800)]
am
f4fc099c: am
4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
* commit '
f4fc099c55ddd7d5c2e28a8b0a7d482b5082e27d':
Alignment in the title area of the notification panel.
Daniel Sandler [Mon, 31 Jan 2011 19:49:03 +0000 (11:49 -0800)]
am
4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
* commit '
4f63da64d82131388ff02586e5fe19662fe641de':
Alignment in the title area of the notification panel.
Daniel Sandler [Mon, 31 Jan 2011 19:46:57 +0000 (11:46 -0800)]
Merge "Alignment in the title area of the notification panel." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)]
Merge "stubs"
Joe Onorato [Mon, 31 Jan 2011 19:28:35 +0000 (11:28 -0800)]
am
19a02219: am
fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
* commit '
19a022194d0e049759112a743835af323f4b05a1':
Mask out the non public bits, not the public ones.
Joe Onorato [Mon, 31 Jan 2011 19:26:51 +0000 (11:26 -0800)]
am
fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
* commit '
fe6fd242867022576a99fcd5fd6078fb7bab8451':
Mask out the non public bits, not the public ones.
Joe Onorato [Mon, 31 Jan 2011 19:25:06 +0000 (11:25 -0800)]
Merge "Mask out the non public bits, not the public ones." into honeycomb
Gilles Debunne [Mon, 31 Jan 2011 19:16:16 +0000 (11:16 -0800)]
am
85ebed39: am
ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
* commit '
85ebed39e4b7710b56e25d10038172dde12ef7b0':
Fxi initial error popup dialog in TextEdit and refreshed assets.
Gilles Debunne [Mon, 31 Jan 2011 19:13:24 +0000 (11:13 -0800)]
am
ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
* commit '
ccfcd9e813d090ec9b4390b5217b32f73dd8263d':
Fxi initial error popup dialog in TextEdit and refreshed assets.
Gilles Debunne [Mon, 31 Jan 2011 19:10:53 +0000 (11:10 -0800)]
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
Jeff Hamilton [Mon, 31 Jan 2011 19:07:50 +0000 (11:07 -0800)]
am
737fe548: (-s ours) am
ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
* commit '
737fe5480f3e5029c298eb3b4c8efb870484cefd':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Jeff Hamilton [Mon, 31 Jan 2011 19:03:50 +0000 (11:03 -0800)]
am
ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
* commit '
ddd11292d1be8d33989e3a67bf6398464ef2632c':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Jeff Hamilton [Mon, 31 Jan 2011 19:01:07 +0000 (11:01 -0800)]
Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
Jeff Hamilton [Mon, 31 Jan 2011 18:14:28 +0000 (10:14 -0800)]
am
1d04981f: am
f7176dfb: am
113834c5: Commit the final API for level 10.
* commit '
1d04981fb2a484212ddb4ffb599e682ed2a9680d':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 18:11:46 +0000 (10:11 -0800)]
am
f7176dfb: am
113834c5: Commit the final API for level 10.
* commit '
f7176dfbd284f7da49e5bccc2aa886b42039ba4a':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 18:05:13 +0000 (10:05 -0800)]
am
113834c5: Commit the final API for level 10.
* commit '
113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
Daniel Sandler [Mon, 31 Jan 2011 17:11:03 +0000 (09:11 -0800)]
am
c05ddc11: am
cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
* commit '
c05ddc111f619d3fa34dcd72ac33d68e6cba0eb8':
Kill spurious animations when vetoing notifications.
Daniel Sandler [Mon, 31 Jan 2011 17:08:00 +0000 (09:08 -0800)]
am
cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
* commit '
cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f':
Kill spurious animations when vetoing notifications.
Daniel Sandler [Mon, 31 Jan 2011 17:04:32 +0000 (09:04 -0800)]
Merge "Kill spurious animations when vetoing notifications." into honeycomb
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:51:27 +0000 (08:51 -0800)]
am
ed670b8b: am
81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
* commit '
ed670b8b25a6cca95d4cdbd01940bb65d8026586':
Fix hardware keyboard switch listener
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:49:30 +0000 (08:49 -0800)]
am
81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
* commit '
81f4b582d4f3547bcd432da6bcb21d4ef414723d':
Fix hardware keyboard switch listener
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:47:12 +0000 (08:47 -0800)]
Merge "Fix hardware keyboard switch listener" into honeycomb
Leon Scroggins [Mon, 31 Jan 2011 16:26:35 +0000 (08:26 -0800)]
am
5592f0b1: am
22e883dd: For Textareas, do not use UI side layers.
* commit '
5592f0b16e44515a3e3686fd417cc1945b83c764':
For Textareas, do not use UI side layers.
Leon Scroggins [Mon, 31 Jan 2011 16:24:31 +0000 (08:24 -0800)]
am
22e883dd: For Textareas, do not use UI side layers.
* commit '
22e883dd4a400122003506f47b228378000dd12f':
For Textareas, do not use UI side layers.
Gil Dobjanschi [Mon, 31 Jan 2011 12:16:16 +0000 (04:16 -0800)]
am
1aa865aa: am
2bb13573: Bug fix:
3405930 Crash editing overlay text
* commit '
1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673':
Bug fix:
3405930 Crash editing overlay text
Gil Dobjanschi [Mon, 31 Jan 2011 12:13:06 +0000 (04:13 -0800)]
am
2bb13573: Bug fix:
3405930 Crash editing overlay text
* commit '
2bb13573d619e3371d06847d36db78a20b17dfab':
Bug fix:
3405930 Crash editing overlay text
Wink Saville [Mon, 31 Jan 2011 07:17:35 +0000 (23:17 -0800)]
am
bac75416: am
cde85d57: Merge "Add debug for tracking bug
3404006." into honeycomb
* commit '
bac75416d1cead62ca54e6e78206da64507146ba':
Add debug for tracking bug
3404006.
Wink Saville [Mon, 31 Jan 2011 07:14:39 +0000 (23:14 -0800)]
am
cde85d57: Merge "Add debug for tracking bug
3404006." into honeycomb
* commit '
cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc':
Add debug for tracking bug
3404006.
Wink Saville [Mon, 31 Jan 2011 07:12:35 +0000 (23:12 -0800)]
Merge "Add debug for tracking bug
3404006." into honeycomb
Bart Sears [Mon, 31 Jan 2011 04:11:06 +0000 (20:11 -0800)]
am
5a773713: am
e3004e78: New DroidSansFallback font file from Ascender
* commit '
5a7737138ec2536faa931df8059509fd36e2e63f':
New DroidSansFallback font file from Ascender
Bart Sears [Mon, 31 Jan 2011 04:08:13 +0000 (20:08 -0800)]
am
e3004e78: New DroidSansFallback font file from Ascender
* commit '
e3004e7867925e70bf4930384a265106f45f87d6':
New DroidSansFallback font file from Ascender
Dheeraj Sharma [Mon, 31 Jan 2011 02:18:43 +0000 (18:18 -0800)]
am
60a3ead5: am
cd73d1ed: Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
* commit '
60a3ead52ec6216b28d1d82ab3480a08bf919c17':
Fix for issue
3404671 Crash when exporting movie in JNI
Dheeraj Sharma [Mon, 31 Jan 2011 02:14:40 +0000 (18:14 -0800)]
am
cd73d1ed: Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
* commit '
cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
Fix for issue
3404671 Crash when exporting movie in JNI
Dheeraj Sharma [Mon, 31 Jan 2011 02:12:25 +0000 (18:12 -0800)]
Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 02:08:12 +0000 (18:08 -0800)]
am
97510f6a: am
260c3c77: Fix issue #
3381489: IllegalStateException: attempt to re-open...
* commit '
97510f6abda493119cbf7db84064291a7edacfc0':
Fix issue #
3381489: IllegalStateException: attempt to re-open...
Dianne Hackborn [Mon, 31 Jan 2011 02:05:08 +0000 (18:05 -0800)]
am
260c3c77: Fix issue #
3381489: IllegalStateException: attempt to re-open...
* commit '
260c3c77d9b340164e055f87002c64d78da6e836':
Fix issue #
3381489: IllegalStateException: attempt to re-open...
Joe Onorato [Mon, 31 Jan 2011 02:01:47 +0000 (18:01 -0800)]
am
0bab356f: am
fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
* commit '
0bab356fd87a973933ad69a30a400571a8394f0b':
I declare settings panel icon VICTORY!
Joe Onorato [Mon, 31 Jan 2011 01:58:47 +0000 (17:58 -0800)]
am
fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
* commit '
fba54f620ff155ede6de7d73f1b6a0003839b1c4':
I declare settings panel icon VICTORY!
Joe Onorato [Mon, 31 Jan 2011 01:56:25 +0000 (17:56 -0800)]
Merge "I declare settings panel icon VICTORY!" into honeycomb
John Reck [Mon, 31 Jan 2011 01:30:17 +0000 (17:30 -0800)]
am
a4b23164: am
13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
* commit '
a4b23164167c571e6d22c3486105fdef17ff8e4a':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
John Reck [Mon, 31 Jan 2011 01:12:29 +0000 (17:12 -0800)]
am
13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
* commit '
13934c2d71046cdd2e7ca33528b91cb83f82dc13':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
John Reck [Mon, 31 Jan 2011 00:55:23 +0000 (16:55 -0800)]
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
Dharmaray Kundargi [Mon, 31 Jan 2011 00:37:44 +0000 (16:37 -0800)]
am
0cc515b4: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
* commit '
0cc515b4adf060df0a9c1b07223389f9b73afb55':
Dharmaray Kundargi [Mon, 31 Jan 2011 00:37:41 +0000 (16:37 -0800)]
am
75aa290d: am
ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '
75aa290d5d23a9bb862e409f9b5de23a0ffda579':
Merging the same files on top of tree.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:35:27 +0000 (16:35 -0800)]
am
ec2cd74e: am
1314bdb2: am
e88fa50b: Merge from open-source gingerbread
* commit '
ec2cd74ee3d43f6d1e6865bf8e576b4b42635a86':
fix failing thread object run
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:08 +0000 (16:35 -0800)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:03 +0000 (16:35 -0800)]
am
ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '
ff8432548eb96655190486ee0f0fa08de5451e66':
Merging the same files on top of tree.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:34:56 +0000 (16:34 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:32:44 +0000 (16:32 -0800)]
am
1314bdb2: am
e88fa50b: Merge from open-source gingerbread
* commit '
1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
fix failing thread object run
Dharmaray Kundargi [Mon, 31 Jan 2011 00:32:07 +0000 (16:32 -0800)]
Merge "Merging the same files on top of tree." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:26:18 +0000 (16:26 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:19:59 +0000 (16:19 -0800)]
am
e88fa50b: Merge from open-source gingerbread
* commit '
e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
fix failing thread object run
Adam Powell [Mon, 31 Jan 2011 00:17:59 +0000 (16:17 -0800)]
am
853f284c: am
c9cb3083: Merge "Fix bug
3405899 - android.view.WindowManager" into honeycomb
* commit '
853f284c0b80540cf447af0e6e704d7a05947efd':
Fix bug
3405899 - android.view.WindowManager$BadTokenException
Dianne Hackborn [Mon, 31 Jan 2011 00:15:13 +0000 (16:15 -0800)]
am
9e3754ff: am
54ad3611: Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
* commit '
9e3754ff6dcc81c43708ce0e13c75de836173f64':
Fix issue #
3404571: Commit final APIs
Adam Powell [Mon, 31 Jan 2011 00:14:54 +0000 (16:14 -0800)]
am
c9cb3083: Merge "Fix bug
3405899 - android.view.WindowManager" into honeycomb
* commit '
c9cb30837116b138a91b251e5217a644231eebef':
Fix bug
3405899 - android.view.WindowManager$BadTokenException
Adam Powell [Mon, 31 Jan 2011 00:12:56 +0000 (16:12 -0800)]
Merge "Fix bug
3405899 - android.view.WindowManager$BadTokenException" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 00:11:36 +0000 (16:11 -0800)]
am
54ad3611: Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
* commit '
54ad36119460b850641556a12b845eadc9875cb4':
Fix issue #
3404571: Commit final APIs
Joe Onorato [Mon, 31 Jan 2011 00:09:29 +0000 (16:09 -0800)]
am
75057b15: am
4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
* commit '
75057b1507881625368f76b2f401097b606bd530':
Check for the STATUS_BAR permission for the system UI properties.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:07:25 +0000 (16:07 -0800)]
am
25503f1c: Merge from gingerbread
* commit '
25503f1c9f0b5f718052b71dc5b21d1c8576d015':
fix failing thread object run
Joe Onorato [Mon, 31 Jan 2011 00:03:59 +0000 (16:03 -0800)]
am
4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
* commit '
4de68baed4bf18b33dc38f89f25410d3d5edfecf':
Check for the STATUS_BAR permission for the system UI properties.
Dianne Hackborn [Mon, 31 Jan 2011 00:01:36 +0000 (16:01 -0800)]
Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 00:00:52 +0000 (16:00 -0800)]
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb