OSDN Git Service
Daniel Sandler [Tue, 1 Mar 2011 02:38:02 +0000 (18:38 -0800)]
Merge "resolved conflicts for merge of
cfeaa492 to master"
Dianne Hackborn [Tue, 1 Mar 2011 02:36:48 +0000 (18:36 -0800)]
Merge "Add ParcelFileDescriptor APIs to get raw fd."
Daniel Sandler [Tue, 1 Mar 2011 02:31:14 +0000 (21:31 -0500)]
resolved conflicts for merge of
cfeaa492 to master
Change-Id: I6ee4e3f822cb91008b1ca64ab9a6673278e501e0
Adam Powell [Tue, 1 Mar 2011 02:16:14 +0000 (18:16 -0800)]
Merge "Change behavior of multitouch in scrolling views."
Fred Quintana [Tue, 1 Mar 2011 02:09:58 +0000 (18:09 -0800)]
Merge "Make the AccountManagerService clear old grants when the package that the grants refer to is no longer installed."
Jeff Brown [Tue, 1 Mar 2011 01:50:33 +0000 (17:50 -0800)]
Merge "Fix inverted scrolling condition in lists."
Mike Lockwood [Tue, 1 Mar 2011 01:46:04 +0000 (17:46 -0800)]
Merge "CameraBrowser: Add USB device filter meta-data for digital cameras"
Mike Lockwood [Tue, 1 Mar 2011 01:45:08 +0000 (17:45 -0800)]
Merge "USB accessory support library"
Mike Lockwood [Tue, 1 Mar 2011 01:05:12 +0000 (17:05 -0800)]
Merge "Add platform features for USB host and USB accessory support."
Mike Lockwood [Tue, 1 Mar 2011 01:04:23 +0000 (17:04 -0800)]
Merge "UsbManager: Enhancements for managing USB devices and accessories"
Ben Komalo [Tue, 1 Mar 2011 00:48:40 +0000 (16:48 -0800)]
Merge "Remove a stale line in a JavaDoc."
Fred Quintana [Tue, 1 Mar 2011 00:25:36 +0000 (16:25 -0800)]
Merge "remove the code that clears the passwords when the sim is replaced with a different one."
Robert Ly [Tue, 1 Mar 2011 00:19:52 +0000 (16:19 -0800)]
Merge "fixing resource browser for renderscript samples because the samples moved"
Stephen Hines [Tue, 1 Mar 2011 00:08:32 +0000 (16:08 -0800)]
Merge "Discovered a matrix element bug while writing cts unit tests."
Adam Cohen [Mon, 28 Feb 2011 23:24:56 +0000 (15:24 -0800)]
Merge "Small change to AppWidgetProviderInfo public field name and docs"
Elliott Hughes [Mon, 28 Feb 2011 23:11:00 +0000 (15:11 -0800)]
Merge "Fix Parcel.writeNative to not ignore 'offset'."
Gilles Debunne [Mon, 28 Feb 2011 22:24:19 +0000 (14:24 -0800)]
Merge "Text selection mode is stopped when View is recycled in ListView"
Gilles Debunne [Mon, 28 Feb 2011 22:23:50 +0000 (14:23 -0800)]
Merge "OnScrollListener fix in AbsListView"
Gilles Debunne [Mon, 28 Feb 2011 22:23:35 +0000 (14:23 -0800)]
Merge "AIOOB exception fix in TabWidget"
Yu Shan Emily Lau [Mon, 28 Feb 2011 22:10:23 +0000 (14:10 -0800)]
Merge "Remove the hard coded media recorder test cases. Add the native heap dump catpure functionality."
Adam Powell [Mon, 28 Feb 2011 21:39:38 +0000 (13:39 -0800)]
Merge "Fix some bugs in the new ScaleGestureDetector logic."
Shimeng (Simon) Wang [Mon, 28 Feb 2011 21:28:58 +0000 (13:28 -0800)]
Merge "Remove the limitation that zoom can't go beyond overview scale."
Jim Miller [Mon, 28 Feb 2011 21:12:56 +0000 (13:12 -0800)]
Merge "Fix
3386135: Make recent apps scrollable with more entries"
Mathias Agopian [Mon, 28 Feb 2011 20:50:25 +0000 (12:50 -0800)]
Merge "surfaceflinger_client: Don't dereference NULL ptrs."
Christopher Tate [Mon, 28 Feb 2011 20:50:09 +0000 (12:50 -0800)]
Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"
Mathias Agopian [Mon, 28 Feb 2011 20:50:04 +0000 (12:50 -0800)]
Merge "Fix sp<> conversion operator / constructor"
Christopher Tate [Thu, 17 Feb 2011 21:00:38 +0000 (13:00 -0800)]
Binder linkage no longer depends on JNI objrefs as persistent tokens
There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:
1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se. Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway. Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.
2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object. The implementation now asks Dalvik
whether object references match.
This amended patch fixes the earlier bug around races between
remote binder death cleanup and local explicit unregistration of
VM-side death recipients.
Bug
2090115
Change-Id: I70bd788a80ea953632b1f466f385ab6b78ef2913
Svetoslav Ganov [Mon, 28 Feb 2011 19:35:05 +0000 (11:35 -0800)]
Merge "NubmberPicker up/down arrows do not work."
Dianne Hackborn [Mon, 28 Feb 2011 19:28:38 +0000 (11:28 -0800)]
Merge "You can now specify a custom display size as NxM."
James Dong [Mon, 28 Feb 2011 19:27:09 +0000 (11:27 -0800)]
Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4."
Daniel Sandler [Mon, 28 Feb 2011 19:26:53 +0000 (11:26 -0800)]
am
5404812d: Merge "When out of range, show device-appropriate no-signal bars." into honeycomb
* commit '
5404812dee9dccbbd43df81752f3061742235982':
When out of range, show device-appropriate no-signal bars.
Daniel Sandler [Mon, 28 Feb 2011 19:17:38 +0000 (11:17 -0800)]
Merge "When out of range, show device-appropriate no-signal bars." into honeycomb
Jean-Baptiste Queru [Mon, 28 Feb 2011 19:08:51 +0000 (11:08 -0800)]
am
71431bb5: am
79b66725: am
25be2c72: am
e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '
71431bb5ca0d8d566d4ebd9d0bc7eb20950290dc':
Fix of tearDown() in SingleLaunchActivityTestCase.
Santosh Madhava [Mon, 28 Feb 2011 19:06:55 +0000 (11:06 -0800)]
Merge "Fix for issue
3466385: Low quality video properties are applied to all"
Jean-Baptiste Queru [Mon, 28 Feb 2011 19:05:55 +0000 (11:05 -0800)]
am
79b66725: am
25be2c72: am
e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '
79b66725b7755e403e10a9d073121789f09b1a9e':
Fix of tearDown() in SingleLaunchActivityTestCase.
Alex Sakhartchouk [Mon, 28 Feb 2011 18:59:29 +0000 (10:59 -0800)]
Merge "These moved into developmnet samples"
Andreas Huber [Mon, 28 Feb 2011 18:40:28 +0000 (10:40 -0800)]
Merge "Add the option '-S' to use surface allocated buffers in the stagefright cmdline tool."
Jean-Baptiste Queru [Mon, 28 Feb 2011 18:18:30 +0000 (10:18 -0800)]
am
25be2c72: am
e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '
25be2c725eba1c94c7fc700e37b194fdcd83a1fb':
Fix of tearDown() in SingleLaunchActivityTestCase.
Xavier Ducrohet [Mon, 28 Feb 2011 18:15:48 +0000 (10:15 -0800)]
am
b732b7b5: am
ce57a7f3: am
6504490c: am
dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '
b732b7b5e8192501360edc15fb8c6399d11fb97d':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
Jean-Baptiste Queru [Mon, 28 Feb 2011 18:15:46 +0000 (10:15 -0800)]
am
e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '
e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
Fix of tearDown() in SingleLaunchActivityTestCase.
Jean-Baptiste Queru [Mon, 28 Feb 2011 18:12:08 +0000 (10:12 -0800)]
Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
Xavier Ducrohet [Mon, 28 Feb 2011 18:10:38 +0000 (10:10 -0800)]
am
ce57a7f3: am
6504490c: am
dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '
ce57a7f35344e76689d30f45964d1e37b78280cb':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
Eric Laurent [Mon, 28 Feb 2011 17:53:04 +0000 (09:53 -0800)]
Merge "Fix issue
3388354."
Xavier Ducrohet [Mon, 28 Feb 2011 17:51:38 +0000 (09:51 -0800)]
am
6504490c: am
dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '
6504490cde3ec5d48321d539e654d1f2072b33f9':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
Jean-Michel Trivi [Mon, 28 Feb 2011 17:33:59 +0000 (09:33 -0800)]
Merge "Fix bug
3376700 Volume too loud at lowest setting"
Leon Scroggins [Mon, 28 Feb 2011 17:32:43 +0000 (09:32 -0800)]
Merge "No radio buttons on <select>"
Rajneesh Chowdury [Mon, 28 Feb 2011 17:26:54 +0000 (09:26 -0800)]
Merge "Instrumentation code to enable/disable memory leak check using setprop"
Xavier Ducrohet [Mon, 28 Feb 2011 17:16:38 +0000 (09:16 -0800)]
am
dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '
dff6b8e71dda9f5d841fa26408714aec2aef1505':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
Santosh Madhava [Mon, 28 Feb 2011 17:12:34 +0000 (09:12 -0800)]
Merge "Fix for issue
3431967: Memory leak from video editor engine"
Ben Murdoch [Mon, 28 Feb 2011 16:45:10 +0000 (08:45 -0800)]
Merge "Don't try to output really long URLs HTML5Audio exception handler."
Glenn Kasten [Mon, 28 Feb 2011 16:44:05 +0000 (08:44 -0800)]
Merge "Bug
3447027 Limit previews for DRM video"
Vasu Nori [Mon, 28 Feb 2011 16:42:24 +0000 (08:42 -0800)]
Merge "fix javadoc on downloadmanager.remove()"
Dirk Dougherty [Mon, 28 Feb 2011 06:37:44 +0000 (22:37 -0800)]
am
1649d91f: am
a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb
* commit '
1649d91f781445a78ce09ed5500503fd96eb9113':
Doc change: Add announce for Android at GDC 2011.
Dirk Dougherty [Mon, 28 Feb 2011 06:34:33 +0000 (22:34 -0800)]
am
a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb
* commit '
a47ef32e8bd8eb944e97e12e3b1fac87f87bcd76':
Doc change: Add announce for Android at GDC 2011.
Dirk Dougherty [Mon, 28 Feb 2011 06:23:25 +0000 (22:23 -0800)]
Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb
Jamie Gennis [Mon, 28 Feb 2011 02:40:09 +0000 (18:40 -0800)]
surfaceflinger_client: Don't dereference NULL ptrs.
This change adds a null pointer check before dereferencing buffers in
a Surface list of known GraphicBuffer objects. If not all the buffers
have been dequeued before this list can legitimately contain NULL
entries.
Change-Id: I0e105b53a3f6f9a5404716b7bf150c793ff648a6
Jamie Gennis [Mon, 28 Feb 2011 00:04:42 +0000 (16:04 -0800)]
am
0dc5fdb9: am
e630e5f4: am
919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit '
0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01':
Prevent SurfaceFlinger from using layer token 31.
Jamie Gennis [Sun, 27 Feb 2011 23:55:21 +0000 (15:55 -0800)]
am
e630e5f4: am
919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit '
e630e5f49ba15005172dceeda7299569b2d2351f':
Prevent SurfaceFlinger from using layer token 31.
Jamie Gennis [Sun, 27 Feb 2011 23:44:36 +0000 (15:44 -0800)]
am
919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit '
919853ce244f853966817d4adb2f3b7b6e4bbe74':
Prevent SurfaceFlinger from using layer token 31.
Jamie Gennis [Sun, 27 Feb 2011 23:27:22 +0000 (15:27 -0800)]
Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
Vasu Nori [Sun, 27 Feb 2011 23:13:28 +0000 (15:13 -0800)]
Merge "bug:
3474580 fix javadoc"
Jeff Brown [Sun, 27 Feb 2011 00:07:51 +0000 (16:07 -0800)]
Merge "Fix a regression matching intents when action doesn't matter."
Jeff Brown [Sat, 26 Feb 2011 23:47:14 +0000 (15:47 -0800)]
Merge "Log errors reading input channel from parcel."
Jeff Brown [Sat, 26 Feb 2011 23:40:51 +0000 (15:40 -0800)]
Merge "Make SHIFT+Backspace be forward delete."
Jeff Brown [Sat, 26 Feb 2011 22:31:21 +0000 (14:31 -0800)]
Merge "Add scroll wheel support to TextView."
Mike Lockwood [Sat, 26 Feb 2011 21:33:19 +0000 (13:33 -0800)]
am
710c510b: (-s ours) am
8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
* commit '
710c510b36a2d260736ca6d036365b18c86b1774':
DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
Mike Lockwood [Sat, 26 Feb 2011 21:33:16 +0000 (13:33 -0800)]
am
fbd67fec: (-s ours) am
0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit '
fbd67fec87e425cfbbd80926cec8cd345d134b4c':
DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
Mike Lockwood [Sat, 26 Feb 2011 21:33:12 +0000 (13:33 -0800)]
am
1b895639: (-s ours) am
69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '
1b8956398be6aeacf0383d8e0931771dbd3a6d2b':
DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
Mike Lockwood [Sat, 26 Feb 2011 21:33:02 +0000 (13:33 -0800)]
am
bbd460d7: (-s ours) am
6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '
bbd460d76dc69eca9a14ab1127b95a55429f460a':
DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
Mike Lockwood [Sat, 26 Feb 2011 21:21:28 +0000 (13:21 -0800)]
am
8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
* commit '
8719c406c3db17842d9350c1f6611f088d105f38':
DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
Mike Lockwood [Sat, 26 Feb 2011 21:21:23 +0000 (13:21 -0800)]
am
0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit '
0600fff9149df3af01e90d4996b70dbc1ee7c135':
DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
Mike Lockwood [Sat, 26 Feb 2011 21:21:20 +0000 (13:21 -0800)]
am
69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '
69e19ae15baa5785667dbf45c7a2d508e429099b':
DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
Mike Lockwood [Sat, 26 Feb 2011 21:21:05 +0000 (13:21 -0800)]
am
6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '
6aea1154bae3a0935fdb9b09b2d91d9548232eb0':
DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
Jamie Gennis [Sat, 26 Feb 2011 02:15:22 +0000 (18:15 -0800)]
Merge "Expand on the SurfaceTexture API docs."
Jesse Wilson [Sat, 26 Feb 2011 01:55:00 +0000 (17:55 -0800)]
Merge "Handle rename of LruCache.entryEvicted to entryRemoved"
Jeff Brown [Sat, 26 Feb 2011 01:28:50 +0000 (17:28 -0800)]
Merge "Add support for mouse hover and scroll wheel."
Jesse Wilson [Sat, 26 Feb 2011 01:15:44 +0000 (17:15 -0800)]
Merge "Callback on any removal, not just evictions."
Glenn Kasten [Sat, 26 Feb 2011 01:10:00 +0000 (17:10 -0800)]
Merge "Revert the 11.xml part of bug
3438513"
Mathias Agopian [Sat, 26 Feb 2011 00:11:44 +0000 (16:11 -0800)]
Fix sp<> conversion operator / constructor
some of the conversion operators were not using the proper
pointer type when calling incStrong/decStrong, usually it
has no bad consequences, but for some implementation
of the ref-counted object it could lead to recording the wrong
owner id.
Change-Id: If574b9069b8a4cf6e0911a992c8f095aba799995
Dianne Hackborn [Sat, 26 Feb 2011 00:15:27 +0000 (16:15 -0800)]
Merge "Implement issue #
3426299: Introduce application "stopped" state"
Chet Haase [Sat, 26 Feb 2011 00:02:34 +0000 (16:02 -0800)]
Merge "ViewPropertyAnimator cancels prior animations"
Andreas Huber [Fri, 25 Feb 2011 23:43:07 +0000 (15:43 -0800)]
am
cd6828e8: (-s ours) am
2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit '
cd6828e84220c6bdf92bbca12fcd88a8da76387c':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
Andreas Huber [Fri, 25 Feb 2011 23:38:06 +0000 (15:38 -0800)]
am
2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit '
2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
Andreas Huber [Fri, 25 Feb 2011 23:33:28 +0000 (15:33 -0800)]
Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
Adam Cohen [Fri, 25 Feb 2011 23:28:29 +0000 (15:28 -0800)]
Merge "Adding framework support for resizable widgets"
Robert Greenwalt [Fri, 25 Feb 2011 23:20:30 +0000 (15:20 -0800)]
Merge "Fixing the write of BackgroundData setting."
Christopher Tate [Fri, 25 Feb 2011 22:37:32 +0000 (14:37 -0800)]
Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"
This reverts commit
c2d55dd89743c8a38deb809f3cdf1ad2d1dbac2b.
Winson Chung [Fri, 25 Feb 2011 23:17:17 +0000 (15:17 -0800)]
Merge "Fixing build"
Alex Sakhartchouk [Fri, 25 Feb 2011 22:53:34 +0000 (14:53 -0800)]
Merge "Moving dependency includes out of librs headers."
Winson Chung [Fri, 25 Feb 2011 22:30:37 +0000 (14:30 -0800)]
Merge "Fixing issue where RemoteViewsService.onDestroy() was never being called."
Xavier Ducrohet [Fri, 25 Feb 2011 22:28:20 +0000 (14:28 -0800)]
Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods."
Jaikumar Ganesh [Fri, 25 Feb 2011 22:25:15 +0000 (14:25 -0800)]
Merge "Unset device trust state before unpairing."
Gilles Debunne [Fri, 25 Feb 2011 21:48:19 +0000 (13:48 -0800)]
Merge "Code clean-up around ScrollView."
Gilles Debunne [Fri, 25 Feb 2011 21:47:37 +0000 (13:47 -0800)]
Merge "Removed ViewTreeObserver in TextView when handles are hidden"
David Li [Fri, 25 Feb 2011 20:59:14 +0000 (12:59 -0800)]
Merge "Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0"
Samyeoul Choi [Fri, 25 Feb 2011 20:55:35 +0000 (12:55 -0800)]
am
350799b7: am
6c5d9a06: am
09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '
350799b72c3180e04ec91469509f6079c932b971':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
Samyeoul Choi [Fri, 25 Feb 2011 20:51:51 +0000 (12:51 -0800)]
am
6c5d9a06: am
09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '
6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
Svetoslav Ganov [Fri, 25 Feb 2011 20:45:53 +0000 (12:45 -0800)]
am
dc365a36: Merge "resolved conflicts for merge of
66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '
dc365a36dac50bccc1411c37839513daec56d335':
Use different version of CLDR data in DatePicker
Svetoslav Ganov [Fri, 25 Feb 2011 20:40:57 +0000 (12:40 -0800)]
Merge "resolved conflicts for merge of
66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
Svetoslav Ganov [Fri, 25 Feb 2011 20:39:59 +0000 (12:39 -0800)]
resolved conflicts for merge of
66edf2bb to honeycomb-plus-aosp
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6