OSDN Git Service
Vasu Nori [Tue, 11 Jan 2011 20:30:13 +0000 (12:30 -0800)]
am
d126d724: Merge "bug:
3339065 enable sqlite concurrency enhancing feature on settingsprovider" into honeycomb
* commit '
d126d724f1bcf528775dd14896aa8641cc3b6b97':
bug:
3339065 enable sqlite concurrency enhancing feature on settingsprovider
Vasu Nori [Tue, 11 Jan 2011 18:37:22 +0000 (10:37 -0800)]
Merge "bug:
3339065 enable sqlite concurrency enhancing feature on settingsprovider" into honeycomb
Robert Greenwalt [Tue, 11 Jan 2011 18:18:05 +0000 (10:18 -0800)]
am
cef29578: Merge "Change local names for greater clarity." into honeycomb
* commit '
cef295780ade72a26201c0c92ed2b64fde03a261':
Change local names for greater clarity.
Robert Greenwalt [Tue, 11 Jan 2011 18:15:21 +0000 (10:15 -0800)]
Merge "Change local names for greater clarity." into honeycomb
Svetoslav Ganov [Tue, 11 Jan 2011 18:03:17 +0000 (10:03 -0800)]
am
52b13678: Merge "IOBE while diabling accessibility with some enabled accessibility services." into honeycomb
* commit '
52b136783cf7b538aae290b6dc609849f3ad695f':
IOBE while diabling accessibility with some enabled accessibility services.
Svetoslav Ganov [Tue, 11 Jan 2011 18:01:00 +0000 (10:01 -0800)]
Merge "IOBE while diabling accessibility with some enabled accessibility services." into honeycomb
Shimeng (Simon) Wang [Tue, 11 Jan 2011 17:59:17 +0000 (09:59 -0800)]
am
eafbce55: Ignore overflow:hidden in overview mode.
* commit '
eafbce55714dbd1f89fe8c131d9c2adcbbc9383e':
Ignore overflow:hidden in overview mode.
Leon Scroggins [Tue, 11 Jan 2011 17:26:57 +0000 (09:26 -0800)]
am
d5208cf4: Merge "Enable write ahead logging on databases used by WebView." into honeycomb
* commit '
d5208cf42c0f9b281505cb465b4de4e8179a6f9f':
Enable write ahead logging on databases used by WebView.
Leon Scroggins [Tue, 11 Jan 2011 17:24:39 +0000 (09:24 -0800)]
Merge "Enable write ahead logging on databases used by WebView." into honeycomb
James Dong [Tue, 11 Jan 2011 16:57:42 +0000 (08:57 -0800)]
am
f2e48873: Merge "Don\'t release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp" into honeycomb
* commit '
f2e48873ae905221b02ab42433f8cee0fc004ed1':
Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp
James Dong [Tue, 11 Jan 2011 16:56:02 +0000 (08:56 -0800)]
Merge "Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp" into honeycomb
Chet Haase [Tue, 11 Jan 2011 15:05:37 +0000 (07:05 -0800)]
am
53ee3316: Rename RGBEvaluator to ArgbEvaluator
* commit '
53ee3316bcb3590ff156b3fd7108903c0817c35d':
Rename RGBEvaluator to ArgbEvaluator
Romain Guy [Tue, 11 Jan 2011 06:27:16 +0000 (22:27 -0800)]
am
91bfb813: Merge "Composite layers as regions." into honeycomb
* commit '
91bfb813b657519b701059a9931ca5d2a407bb80':
Composite layers as regions.
Romain Guy [Tue, 11 Jan 2011 06:25:05 +0000 (22:25 -0800)]
Merge "Composite layers as regions." into honeycomb
Romain Guy [Tue, 11 Jan 2011 05:13:24 +0000 (21:13 -0800)]
am
89254c98: Merge "Better logging of out of memory errors in OpenGLRenderer." into honeycomb
* commit '
89254c984e8197c2d60ce6c1da3b11b8d445bf9f':
Better logging of out of memory errors in OpenGLRenderer.
Romain Guy [Tue, 11 Jan 2011 05:11:27 +0000 (21:11 -0800)]
Merge "Better logging of out of memory errors in OpenGLRenderer." into honeycomb
Jim Miller [Tue, 11 Jan 2011 05:08:05 +0000 (21:08 -0800)]
am
19b78d94: Merge "Fix
3305645: Hide recents if there are no recent apps." into honeycomb
* commit '
19b78d949cba4aaaf3f1812a823818db05501451':
Fix
3305645: Hide recents if there are no recent apps.
Jim Miller [Tue, 11 Jan 2011 05:06:22 +0000 (21:06 -0800)]
Merge "Fix
3305645: Hide recents if there are no recent apps." into honeycomb
Jeff Brown [Tue, 11 Jan 2011 04:19:23 +0000 (20:19 -0800)]
am
f527a1d9: Merge "Prevent events from getting backlogged." into honeycomb
* commit '
f527a1d936aea3d531ced39ccc714935a7d02c47':
Prevent events from getting backlogged.
Jeff Brown [Tue, 11 Jan 2011 04:17:28 +0000 (20:17 -0800)]
Merge "Prevent events from getting backlogged." into honeycomb
Mike Lockwood [Tue, 11 Jan 2011 03:38:44 +0000 (19:38 -0800)]
am
3459e27e: un@hide android.os.Environment.isExternalStorageEmulated()
* commit '
3459e27e5d2f92d2d5487c189c9386c031e79fc1':
un@hide android.os.Environment.isExternalStorageEmulated()
Louis Huemiller [Tue, 11 Jan 2011 02:11:59 +0000 (18:11 -0800)]
am
bcd3b56a: Merge "Hardware Composer Test hwcCommit set blend type" into honeycomb
* commit '
bcd3b56acfa0974daaa559ed25e4d51efadc1634':
Hardware Composer Test hwcCommit set blend type
Louis Huemiller [Tue, 11 Jan 2011 02:09:49 +0000 (18:09 -0800)]
Merge "Hardware Composer Test hwcCommit set blend type" into honeycomb
Louis Huemiller [Tue, 11 Jan 2011 02:03:05 +0000 (18:03 -0800)]
Hardware Composer Test hwcCommit set blend type
Change-Id: If345641bd009cfd131b1a8e74cd4a9e8e4a7dfc7
Louis Huemiller [Tue, 11 Jan 2011 01:48:36 +0000 (17:48 -0800)]
am
f6e4c0b5: Merge "Hardware Composer Test Overlap Stats" into honeycomb
* commit '
f6e4c0b557492969733ce1cdd70b5db6132d31fe':
Hardware Composer Test Overlap Stats
Louis Huemiller [Tue, 11 Jan 2011 01:46:38 +0000 (17:46 -0800)]
Merge "Hardware Composer Test Overlap Stats" into honeycomb
Xavier Ducrohet [Tue, 11 Jan 2011 01:46:28 +0000 (17:46 -0800)]
am
a57ca45d: Merge "LayoutLib: move asserts around." into honeycomb
* commit '
a57ca45d5df0f79b9be408105d2ed1c34e128130':
LayoutLib: move asserts around.
Xavier Ducrohet [Tue, 11 Jan 2011 01:44:16 +0000 (17:44 -0800)]
Merge "LayoutLib: move asserts around." into honeycomb
Joe Onorato [Tue, 11 Jan 2011 01:44:16 +0000 (17:44 -0800)]
am
9c3850f2: Merge "current.xml" into honeycomb
* commit '
9c3850f24e66d4c61337e749da843444cbb65d10':
current.xml
Joe Onorato [Tue, 11 Jan 2011 01:41:54 +0000 (17:41 -0800)]
Merge "current.xml" into honeycomb
Adam Powell [Tue, 11 Jan 2011 01:38:59 +0000 (17:38 -0800)]
am
5c5fa339: Merge "Fix bug
3333015 - Overflow menu item submenus do not open" into honeycomb
* commit '
5c5fa339b4658287217eb0a4639e6e52d192f0ab':
Fix bug
3333015 - Overflow menu item submenus do not open
Joe Onorato [Tue, 11 Jan 2011 01:36:47 +0000 (17:36 -0800)]
am
94d7eef3: Merge "Make AppWidgetService handle components enabling and disabling." into honeycomb
* commit '
94d7eef3bee2351f5490e7e1e5d83d5e4ceca13e':
Make AppWidgetService handle components enabling and disabling.
Joe Onorato [Tue, 11 Jan 2011 01:36:42 +0000 (17:36 -0800)]
am
e5e95588: Merge "add ComponentInfo.isEnabled()" into honeycomb
* commit '
e5e9558871df227a09420fed6f16c33e6af0e3e7':
add ComponentInfo.isEnabled()
Adam Powell [Tue, 11 Jan 2011 01:35:34 +0000 (17:35 -0800)]
Merge "Fix bug
3333015 - Overflow menu item submenus do not open" into honeycomb
Romain Guy [Tue, 11 Jan 2011 01:34:22 +0000 (17:34 -0800)]
am
58818ab5: Merge "Fix the build" into honeycomb
* commit '
58818ab5b5dd14f5b40602cd07114de78c110b58':
Fix the build
Joe Onorato [Tue, 11 Jan 2011 01:33:28 +0000 (17:33 -0800)]
Merge "Make AppWidgetService handle components enabling and disabling." into honeycomb
Joe Onorato [Tue, 11 Jan 2011 01:33:18 +0000 (17:33 -0800)]
Merge "add ComponentInfo.isEnabled()" into honeycomb
Leon Scroggins [Tue, 11 Jan 2011 01:32:10 +0000 (17:32 -0800)]
am
86e1fa64: Remove nativeCursorMatchesFocus, which is no longer necessary.
* commit '
86e1fa647f7541b091753cf6a2314935b1011406':
Remove nativeCursorMatchesFocus, which is no longer necessary.
Romain Guy [Tue, 11 Jan 2011 01:30:57 +0000 (17:30 -0800)]
Merge "Fix the build" into honeycomb
Louis Huemiller [Tue, 11 Jan 2011 01:21:15 +0000 (17:21 -0800)]
Hardware Composer Test Overlap Stats
Change-Id: I2f4a02924149f3964de31fb6250f4c21a64d96aa
Robert Greenwalt [Tue, 11 Jan 2011 01:15:16 +0000 (17:15 -0800)]
am
55ccb887: Merge "Don\'t check for services before boot-complete" into honeycomb
* commit '
55ccb8877549c539daa9b78d370452680045a77b':
Don't check for services before boot-complete
Robert Greenwalt [Tue, 11 Jan 2011 01:13:24 +0000 (17:13 -0800)]
Merge "Don't check for services before boot-complete" into honeycomb
Jeff Brown [Tue, 11 Jan 2011 01:13:08 +0000 (17:13 -0800)]
am
f900fed8: Merge "Fix NPEs in detached views." into honeycomb
* commit '
f900fed8826ad41f8e280537262dea506d177382':
Fix NPEs in detached views.
Jeff Brown [Tue, 11 Jan 2011 01:11:34 +0000 (17:11 -0800)]
Merge "Fix NPEs in detached views." into honeycomb
Mike Lockwood [Tue, 11 Jan 2011 01:02:42 +0000 (17:02 -0800)]
am
f9a04233: @hide android.permission.WRITE_MEDIA_STORAGE
* commit '
f9a04233c1db22a6ddd989b55db725badeae7539':
@hide android.permission.WRITE_MEDIA_STORAGE
Romain Guy [Tue, 11 Jan 2011 00:41:54 +0000 (16:41 -0800)]
am
3b703f2d: Hide Canvas.getGL()
* commit '
3b703f2d11f20efaa953ad31d6c97fe3561efb03':
Hide Canvas.getGL()
Alex Sakhartchouk [Tue, 11 Jan 2011 00:29:27 +0000 (16:29 -0800)]
am
fe852e21: Updating cubemap loading code.
* commit '
fe852e216fdfab20e7b3d3e55247f70634d267b9':
Updating cubemap loading code.
Vasu Nori [Mon, 10 Jan 2011 23:49:20 +0000 (15:49 -0800)]
am
3045bbaf: bug:
3330569 print better message to help debug the problem
* commit '
3045bbaf58574ad3168466b198b835b29d174c18':
bug:
3330569 print better message to help debug the problem
Dmitri Plotnikov [Mon, 10 Jan 2011 23:32:06 +0000 (15:32 -0800)]
am
817b3f93: Fixing field description.
* commit '
817b3f934271115258838d5cc4903ad5a2bef0f3':
Fixing field description.
Huahui Wu [Mon, 10 Jan 2011 23:25:05 +0000 (15:25 -0800)]
am
0904c0dc: b/
3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set. WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved. WebVie
* commit '
0904c0dcfb11da9bb756b8d4f8a817b5efc9edc0':
b/
3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set. WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved. WebView.java: 1. Extracted the common code for multi-touch and single touch to a new private function: handleTouchEventCommon() 2. Extracted the multi-touch code, including zooming and panning, to a new private function: handleMultiTouchInWebView() 3. In onTouchEvent(), single touch events keep the code path, but multi-touch events are always passed to Webkit first. 4. In Privatehandler.handleMessage(), if WebKit didn't consume the multi-touch event, the private handler calls the handleMultiTouchInWebView() to zoom and pan.
Romain Guy [Mon, 10 Jan 2011 23:00:23 +0000 (15:00 -0800)]
Subir Jhanb [Mon, 10 Jan 2011 22:40:01 +0000 (14:40 -0800)]
am
e896be71: Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:
3337128
* commit '
e896be71c70c7aaa86886fec1044c53e93c42621':
Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:
3337128
Stephen Hines [Mon, 10 Jan 2011 22:16:26 +0000 (14:16 -0800)]
am
d94988bb: Merge "Split time functions into rs_time.rsh header." into honeycomb
* commit '
d94988bb0cc65e5de71ab3c43ddf26e5c72dbc32':
Split time functions into rs_time.rsh header.
Stephen Hines [Mon, 10 Jan 2011 22:14:35 +0000 (14:14 -0800)]
Merge "Split time functions into rs_time.rsh header." into honeycomb
Romain Guy [Mon, 10 Jan 2011 21:41:45 +0000 (13:41 -0800)]
am
778f5f95: Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb
* commit '
778f5f95d7f74ac12bc426c37dd1fc7abc05e15b':
Make sure onCancelled() is called if cancel() is called early.
Elliott Hughes [Mon, 10 Jan 2011 21:41:41 +0000 (13:41 -0800)]
am
6452c259: Merge "Remove tests for dead API." into honeycomb
* commit '
6452c259e0547bcb5aede8d52e1307ee8cf86d89':
Remove tests for dead API.
Romain Guy [Mon, 10 Jan 2011 21:39:41 +0000 (13:39 -0800)]
Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb
Elliott Hughes [Mon, 10 Jan 2011 21:39:30 +0000 (13:39 -0800)]
Merge "Remove tests for dead API." into honeycomb
Jesse Wilson [Mon, 10 Jan 2011 20:59:59 +0000 (12:59 -0800)]
am
eb97c0dd: Patch new JSON APIs with changes informed by GSON.
* commit '
eb97c0ddc063176c26065fc6855188edf0c16e03':
Patch new JSON APIs with changes informed by GSON.
Gilles Debunne [Mon, 10 Jan 2011 20:51:25 +0000 (12:51 -0800)]
am
b3fbd7e0: Merge "Stop text selection mode when new text replaces selection." into honeycomb
* commit '
b3fbd7e0fd44a72fb7ccba0959481b8a806608b7':
Stop text selection mode when new text replaces selection.
Gilles Debunne [Mon, 10 Jan 2011 20:49:23 +0000 (12:49 -0800)]
Merge "Stop text selection mode when new text replaces selection." into honeycomb
Leon Scroggins [Mon, 10 Jan 2011 20:47:11 +0000 (12:47 -0800)]
am
e0b19124: Merge "Do not store the find callback until action mode starts." into honeycomb
* commit '
e0b1912480d3c5cfa3f4cf3dd9d7cddd10d68c63':
Do not store the find callback until action mode starts.
Jamie Gennis [Mon, 10 Jan 2011 20:47:06 +0000 (12:47 -0800)]
am
fbab3b67: Merge "Fix a bug in SurfaceTexture::setBufferCount." into honeycomb
* commit '
fbab3b67afc904450613204400d9e8779feb5659':
Fix a bug in SurfaceTexture::setBufferCount.
Jamie Gennis [Mon, 10 Jan 2011 20:47:03 +0000 (12:47 -0800)]
am
ffe3f1cb: Merge "Add method logging to the SurfaceTexture C++ class." into honeycomb
* commit '
ffe3f1cb16d37e56ab69ad345f47c6d3f52b916c':
Add method logging to the SurfaceTexture C++ class.
Jamie Gennis [Mon, 10 Jan 2011 20:47:00 +0000 (12:47 -0800)]
am
c936c5ce: Merge "Initialize the SurfaceTexture buffer slots." into honeycomb
* commit '
c936c5cec648cd60637275fc6dba2265ae446044':
Initialize the SurfaceTexture buffer slots.
Leon Scroggins [Mon, 10 Jan 2011 20:41:20 +0000 (12:41 -0800)]
Merge "Do not store the find callback until action mode starts." into honeycomb
Jamie Gennis [Mon, 10 Jan 2011 20:30:33 +0000 (12:30 -0800)]
Merge "Fix a bug in SurfaceTexture::setBufferCount." into honeycomb
Jamie Gennis [Mon, 10 Jan 2011 20:30:14 +0000 (12:30 -0800)]
Merge "Add method logging to the SurfaceTexture C++ class." into honeycomb
Jamie Gennis [Mon, 10 Jan 2011 20:29:51 +0000 (12:29 -0800)]
Merge "Initialize the SurfaceTexture buffer slots." into honeycomb
Andy McFadden [Mon, 10 Jan 2011 20:08:43 +0000 (12:08 -0800)]
am
155b552b: Merge "Fix start-time setreuid complaints." into honeycomb
* commit '
155b552b1d7b8ff705c325ee435022cc135f6486':
Fix start-time setreuid complaints.
Andy McFadden [Mon, 10 Jan 2011 20:07:03 +0000 (12:07 -0800)]
Merge "Fix start-time setreuid complaints." into honeycomb
Andreas Huber [Mon, 10 Jan 2011 20:02:35 +0000 (12:02 -0800)]
am
b736cb28: Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
* commit '
b736cb28ab414c16b9cd89923a6da3778847cf2a':
Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
Andreas Huber [Mon, 10 Jan 2011 19:28:44 +0000 (11:28 -0800)]
am
748ba9a9: Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
* commit '
748ba9a9512dee65d5b09cfe26a34ded753f4aab':
NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.
Andreas Huber [Mon, 10 Jan 2011 19:26:38 +0000 (11:26 -0800)]
Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
Leon Scroggins [Mon, 10 Jan 2011 19:05:19 +0000 (11:05 -0800)]
am
9cac3c31: Remove the option to use shift to start selection mode.
* commit '
9cac3c31d29134f9bf4de10765b81ed45c13d31a':
Remove the option to use shift to start selection mode.
Xavier Ducrohet [Mon, 10 Jan 2011 18:57:18 +0000 (10:57 -0800)]
am
5c6b786e: Merge "LayoutLib: display warning when a resource reference fails to resolve." into honeycomb
* commit '
5c6b786e1c1a103fe3f80b294ac166da1555fffa':
LayoutLib: display warning when a resource reference fails to resolve.
Xavier Ducrohet [Mon, 10 Jan 2011 18:55:17 +0000 (10:55 -0800)]
am
0f83b571: Merge "LayoutLib: Fix moveChild animation." into honeycomb
* commit '
0f83b571e294a443a992cdf71bc5e6aaf7464d39':
LayoutLib: Fix moveChild animation.
Xavier Ducrohet [Mon, 10 Jan 2011 18:54:18 +0000 (10:54 -0800)]
Merge "LayoutLib: display warning when a resource reference fails to resolve." into honeycomb
Xavier Ducrohet [Mon, 10 Jan 2011 18:53:37 +0000 (10:53 -0800)]
Merge "LayoutLib: Fix moveChild animation." into honeycomb
Gilles Debunne [Mon, 10 Jan 2011 18:15:48 +0000 (10:15 -0800)]
am
58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
* commit '
58f750ad145e6920c1c75bed8b333e54d78f3fed':
Fix for an NPE in Account settings on long press.
James Dong [Mon, 10 Jan 2011 18:13:40 +0000 (10:13 -0800)]
am
be0ae5ea: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
* commit '
be0ae5ea135539f044f660b4a4d5105e14574804':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object
Gilles Debunne [Mon, 10 Jan 2011 18:12:59 +0000 (10:12 -0800)]
Merge "Fix for an NPE in Account settings on long press." into honeycomb
James Dong [Mon, 10 Jan 2011 18:11:18 +0000 (10:11 -0800)]
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
Adam Cohen [Mon, 10 Jan 2011 18:08:19 +0000 (10:08 -0800)]
am
4c894519: Merge "Fixing bug where StackView doesn\'t clip it\'s children correctly" into honeycomb
* commit '
4c8945191c60a92123c3df15a1f0a737a7084449':
Fixing bug where StackView doesn't clip it's children correctly
Adam Cohen [Mon, 10 Jan 2011 18:06:19 +0000 (10:06 -0800)]
Merge "Fixing bug where StackView doesn't clip it's children correctly" into honeycomb
Cary Clark [Mon, 10 Jan 2011 17:57:02 +0000 (09:57 -0800)]
am
b74e32cc: Merge "add more alt key acceleration in webview" into honeycomb
* commit '
b74e32cc7ded9b26c1ba1e1bcff98fc9e7128562':
add more alt key acceleration in webview
Cary Clark [Mon, 10 Jan 2011 17:55:54 +0000 (09:55 -0800)]
Merge "add more alt key acceleration in webview" into honeycomb
John Reck [Mon, 10 Jan 2011 17:50:53 +0000 (09:50 -0800)]
am
36fd7a39: Tweak user agent building to avoid multiple spaces
* commit '
36fd7a39caafac26ea3d56ffc924bce0a53092f1':
Tweak user agent building to avoid multiple spaces
Mike Lockwood [Mon, 10 Jan 2011 17:26:31 +0000 (09:26 -0800)]
am
5e63e251: Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb
* commit '
5e63e2515f3f0d2712d80f2cb27f263f8d3d1081':
Add separate permission and group for access to the MTP USB driver
Mike Lockwood [Mon, 10 Jan 2011 17:24:46 +0000 (09:24 -0800)]
Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb
Leon Scroggins [Mon, 10 Jan 2011 16:32:56 +0000 (08:32 -0800)]
am
aa6b9f55: Do not show autofill++ or saved form data in incognito mode.
* commit '
aa6b9f55d60702211dd2d08403c7296347f0bd7d':
Do not show autofill++ or saved form data in incognito mode.
Cary Clark [Mon, 10 Jan 2011 15:29:03 +0000 (07:29 -0800)]
am
8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb
* commit '
8733bea4c1631cf1d6758c45d5f2a279f7d66eed':
scroll selected text in scrollable layers
Cary Clark [Mon, 10 Jan 2011 15:25:33 +0000 (07:25 -0800)]
Merge "scroll selected text in scrollable layers" into honeycomb
Adam Powell [Mon, 10 Jan 2011 05:39:49 +0000 (21:39 -0800)]
am
8b50495d: Merge "Fix bug
3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
* commit '
8b50495d02a6423bfa5c8cf6406e3e06b7c84f7f':
Fix bug
3324981 - Inconsistent/buggy FastScroll behavior
Adam Powell [Mon, 10 Jan 2011 05:38:05 +0000 (21:38 -0800)]
Merge "Fix bug
3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
Louis Huemiller [Mon, 10 Jan 2011 04:19:49 +0000 (20:19 -0800)]
am
6b22a994: Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb
* commit '
6b22a99481d8fadbd7f8c56b2c3b7dbc28ddd0de':
Hardware Composer Test Lib HBlen off by 1
Louis Huemiller [Mon, 10 Jan 2011 04:17:30 +0000 (20:17 -0800)]
Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb
Louis Huemiller [Mon, 10 Jan 2011 03:02:05 +0000 (19:02 -0800)]
Hardware Composer Test Lib HBlen off by 1
Change-Id: If51727a041e20afa307e5d1735b77da5a54a712b
Jeff Hamilton [Mon, 10 Jan 2011 03:01:56 +0000 (21:01 -0600)]
Merge commit '
525f953b' into manualmerge
Conflicts:
api/current.xml
Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
Jason Sams [Mon, 10 Jan 2011 00:48:25 +0000 (16:48 -0800)]
am
e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb
* commit '
e06c3a599f5d274ef7b1afa694ac2b1961f75aeb':
Fix cleanup race condition where objects might may not be cleaned up correctly.