OSDN Git Service
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
Samyeoul Choi [Fri, 25 Feb 2011 20:08:08 +0000 (12:08 -0800)]
am
09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '
092238916fd5d10090c0bcad33644778a1f366e7':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
James Dong [Fri, 25 Feb 2011 19:52:14 +0000 (11:52 -0800)]
Merge "mp4a box contains mp3 audio when the object type indication is 0x6b"
Eric Fischer [Fri, 25 Feb 2011 19:48:14 +0000 (11:48 -0800)]
Merge "Import revised translations."
Eric Fischer [Fri, 25 Feb 2011 19:26:13 +0000 (11:26 -0800)]
am
040f6150: (-s ours) am
9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
040f61504aeab1d905ac9fb85945699877e78d4e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 25 Feb 2011 19:11:13 +0000 (11:11 -0800)]
am
9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
9967ce04572e916a5f68ae0f9345f13b35ec20b0':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 25 Feb 2011 18:54:34 +0000 (10:54 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Shimeng (Simon) Wang [Fri, 25 Feb 2011 18:37:33 +0000 (10:37 -0800)]
Merge "Make sure pinch zoom and overview scale are within limits"
Vasu Nori [Fri, 25 Feb 2011 16:57:59 +0000 (08:57 -0800)]
Merge "bug:
3467948 if byteArray couldn't be allocated for blob, throw exception"
Leon Scroggins [Fri, 25 Feb 2011 16:21:23 +0000 (08:21 -0800)]
Merge "Comment clean up."
Wu-cheng Li [Fri, 25 Feb 2011 09:36:56 +0000 (01:36 -0800)]
Merge "Improve camera getSupportedPreviewFormats javadoc."
Svetoslav Ganov [Fri, 25 Feb 2011 08:09:03 +0000 (00:09 -0800)]
am
9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
* commit '
9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
Use different version of CLDR data in DatePicker
Svetoslav Ganov [Fri, 25 Feb 2011 07:56:52 +0000 (23:56 -0800)]
Merge "Use different version of CLDR data in DatePicker" into gingerbread
Wink Saville [Fri, 25 Feb 2011 06:08:41 +0000 (22:08 -0800)]
Merge "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
Jeff Hamilton [Fri, 25 Feb 2011 04:45:27 +0000 (20:45 -0800)]
am
09979bcf: am
fd34aa8e: am
5644d0e1: Support for NDEF on iCODE.
* commit '
09979bcf730e7df033ab0d8cadf564873c7e624b':
Support for NDEF on iCODE.
Jeff Hamilton [Fri, 25 Feb 2011 04:43:15 +0000 (20:43 -0800)]
am
fd34aa8e: am
5644d0e1: Support for NDEF on iCODE.
* commit '
fd34aa8e1386547bcfbaf043f26c054946b92c2b':
Support for NDEF on iCODE.
Robert Ly [Fri, 25 Feb 2011 04:35:06 +0000 (20:35 -0800)]
am
dbc796c5: am
b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb
* commit '
dbc796c5c045af6a5a7730a267c3c3a574e2bd3e':
Doc change: fixing errors in library proj docs
Robert Ly [Fri, 25 Feb 2011 04:35:00 +0000 (20:35 -0800)]
am
92a07c63: am
00e08463: Doc change: clarifying nfc tech filter usage
* commit '
92a07c634d38221cbdb1253124efedc3da0dd487':
Doc change: clarifying nfc tech filter usage
Xavier Ducrohet [Fri, 25 Feb 2011 04:32:31 +0000 (20:32 -0800)]
am
b84c678a: (-s ours) am
db1acf52: (-s ours) am
1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit '
b84c678a9c397d5b3c5141ddda304ceb71426c8d':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Xavier Ducrohet [Fri, 25 Feb 2011 04:32:13 +0000 (20:32 -0800)]
am
b052ecaa: resolved conflicts for merge of
86e43034 to honeycomb-plus-aosp
* commit '
b052ecaa7e6ce40cec43efe5353b4bb12079aa55':
LayoutLib: Original import of Honeycomb's layoutlib. do not merge.
Jeff Hamilton [Fri, 25 Feb 2011 04:30:14 +0000 (20:30 -0800)]
am
5644d0e1: Support for NDEF on iCODE.
* commit '
5644d0e18ad847b66a8cb4f185cb28edebe75d88':
Support for NDEF on iCODE.
Romain Guy [Fri, 25 Feb 2011 03:50:26 +0000 (19:50 -0800)]
Merge "Remove the right entries from the cache when a GC happens."
Jesse Wilson [Fri, 25 Feb 2011 03:37:00 +0000 (19:37 -0800)]
Merge "Remove default constructors from static utility classes."
Chung-yih Wang [Fri, 25 Feb 2011 03:27:12 +0000 (19:27 -0800)]
Merge "Activate the wifi high perf. for sip calls."
Mathias Agopian [Fri, 25 Feb 2011 02:27:40 +0000 (18:27 -0800)]
Merge "Fix a wp<> bug where the owner ID would be wrong"
Robert Ly [Fri, 25 Feb 2011 02:13:43 +0000 (18:13 -0800)]
am
b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb
* commit '
b7a8c1e781517b5c6b47ee2b0c7bd0e70d9a1880':
Doc change: fixing errors in library proj docs
Mathias Agopian [Fri, 25 Feb 2011 02:12:34 +0000 (18:12 -0800)]
Fix a wp<> bug where the owner ID would be wrong
this was introduced recently. we make sure to use
the correct owner id (the sp) instead of the wp.
Change-Id: I78fdc6ec0c2d3e687278b70442d74d1924b512a2
Robert Ly [Fri, 25 Feb 2011 02:07:28 +0000 (18:07 -0800)]
Merge "Doc change: fixing errors in library proj docs" into honeycomb
Robert Ly [Fri, 25 Feb 2011 02:02:58 +0000 (18:02 -0800)]
am
00e08463: Doc change: clarifying nfc tech filter usage
* commit '
00e08463cb8df0969e71fd731a4e078680c4f2b5':
Doc change: clarifying nfc tech filter usage
Basavapatna Dattaguru [Fri, 25 Feb 2011 01:56:15 +0000 (17:56 -0800)]
Merge "VideoEditor: Issue:
3396697: Update Perf and Stress test code"
Romain Guy [Fri, 25 Feb 2011 01:45:21 +0000 (17:45 -0800)]
Merge "Correctly blend translucent GIF bitmaps."
Daniel Sandler [Fri, 25 Feb 2011 01:33:41 +0000 (17:33 -0800)]
Merge "Notification flyover tuning:"
Xavier Ducrohet [Fri, 25 Feb 2011 01:24:07 +0000 (17:24 -0800)]
am
db1acf52: (-s ours) am
1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit '
db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Xavier Ducrohet [Fri, 25 Feb 2011 01:19:38 +0000 (17:19 -0800)]
resolved conflicts for merge of
86e43034 to honeycomb-plus-aosp
Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
Adam Powell [Fri, 25 Feb 2011 01:19:20 +0000 (17:19 -0800)]
Merge "Ensure WebView passes a complete/in-order event stream to ScaleGestureDetector. Prerequisite for several ScaleGestureDetector bugfixes."
Svetoslav Ganov [Fri, 25 Feb 2011 00:48:38 +0000 (16:48 -0800)]
Merge "Exposing the CalendarView of the DatePicker."
Svetoslav Ganov [Fri, 25 Feb 2011 00:48:26 +0000 (16:48 -0800)]
Merge "The NumberPicker input cotrols are somtimes not shown."
Jamie Gennis [Fri, 25 Feb 2011 00:48:15 +0000 (16:48 -0800)]
Merge "Revert "Merge "Expand on the SurfaceTexture API docs."""
Jaikumar Ganesh [Fri, 25 Feb 2011 00:34:37 +0000 (16:34 -0800)]
Merge "Refactor android.server.BluetoothService classes."
Andreas Huber [Fri, 25 Feb 2011 00:26:14 +0000 (16:26 -0800)]
Merge "Alternate patch for late video issue: seek only the video ahead to the next"
Santosh Madhava [Fri, 25 Feb 2011 00:25:53 +0000 (16:25 -0800)]
Merge "Fix for issue
3485010: The project thumbnail is not regenerated"
Mathias Agopian [Fri, 25 Feb 2011 00:23:51 +0000 (16:23 -0800)]
Merge "Fix some issues with RefBase debugging."
Xavier Ducrohet [Fri, 25 Feb 2011 00:21:41 +0000 (16:21 -0800)]
am
1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit '
1175ef7e2e4f68532d8ade672d7f5502d9946ce4':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Xavier Ducrohet [Fri, 25 Feb 2011 00:15:11 +0000 (16:15 -0800)]
resolved conflicts for merge of
a4350fc0 to gingerbread-plus-aosp
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
Andreas Huber [Thu, 24 Feb 2011 22:49:10 +0000 (14:49 -0800)]
Merge "Suppress the logging of URLs when in incognito mode."
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:58 +0000 (14:44 -0800)]
Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:52 +0000 (14:44 -0800)]
Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread
Xavier Ducrohet [Thu, 24 Feb 2011 22:35:01 +0000 (14:35 -0800)]
Merge "LayoutLib: move tests to their own project."
Jamie Gennis [Thu, 24 Feb 2011 22:24:04 +0000 (14:24 -0800)]
Merge "Expand on the SurfaceTexture API docs."
Mike Lockwood [Thu, 24 Feb 2011 22:05:02 +0000 (14:05 -0800)]
Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts"
Eric Fischer [Thu, 24 Feb 2011 22:03:30 +0000 (14:03 -0800)]
Merge "Import revised translations."
Eric Hassold [Thu, 24 Feb 2011 21:47:16 +0000 (13:47 -0800)]
Merge "Detect out of memory in extractAlpha"
Daniel Sandler [Thu, 24 Feb 2011 21:36:52 +0000 (13:36 -0800)]
Merge "Remove commented cruft, TODOs, and dead code."
Christopher Tate [Thu, 24 Feb 2011 21:22:19 +0000 (13:22 -0800)]
Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"
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.
Bug
2090115
Change-Id: If62edd554d0a9fbb2d2977b0cbf8ad7cc8e2e68d
Glenn Kasten [Thu, 24 Feb 2011 20:37:02 +0000 (12:37 -0800)]
Merge "Bug
3438258 Add SurfaceTexture as MediaPlayer sink"
Cary Clark [Thu, 24 Feb 2011 20:19:09 +0000 (12:19 -0800)]
Merge "center long press to account for sloppy nodes"
Eric Fischer [Thu, 24 Feb 2011 19:24:39 +0000 (11:24 -0800)]
am
86409c8c: (-s ours) am
1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
86409c8cb789cd7f672ee6de43e6bf1a337847db':
Import revised translations. DO NOT MERGE
Leon Scroggins [Thu, 24 Feb 2011 19:21:41 +0000 (11:21 -0800)]
Merge "Stop the blinking caret when moving to another field."
Eric Fischer [Thu, 24 Feb 2011 19:18:56 +0000 (11:18 -0800)]
am
1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
1c38872fd30d7b19a01cc309537e911e7f2344e9':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 19:15:53 +0000 (11:15 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Patrick Dubroy [Thu, 24 Feb 2011 18:55:44 +0000 (10:55 -0800)]
Merge "Fix
3272590: Long-press on home & menu should be same as click"
Wink Saville [Thu, 24 Feb 2011 18:52:53 +0000 (10:52 -0800)]
am
ee38808d: am
0dc8618d: Do not start RILReceiver if wifi-only.
* commit '
ee38808dcca92fa8677e7d03401f6bb7b54ec781':
Do not start RILReceiver if wifi-only.
Wink Saville [Thu, 24 Feb 2011 18:50:31 +0000 (10:50 -0800)]
am
0dc8618d: Do not start RILReceiver if wifi-only.
* commit '
0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
Do not start RILReceiver if wifi-only.
repo sync [Thu, 24 Feb 2011 18:40:50 +0000 (10:40 -0800)]
am
3905bc6c: (-s ours) am
be2ed6d6: resolved conflicts for merge of
c96b6690 to gingerbread-plus-aosp
* commit '
3905bc6ca3a2f29d2eb3fc9086ca0078f39c6829':
DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=
d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=
3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
Shimeng (Simon) Wang [Thu, 24 Feb 2011 18:32:18 +0000 (10:32 -0800)]
Merge "Pre-calculate view scale and text wrap scale for webkit."
Gilles Debunne [Thu, 24 Feb 2011 18:29:44 +0000 (10:29 -0800)]
Merge "Cursors correctly displayed with legacy theme."
Gilles Debunne [Thu, 24 Feb 2011 18:29:22 +0000 (10:29 -0800)]
Merge "Text handles movement improvements."
repo sync [Thu, 24 Feb 2011 18:26:49 +0000 (10:26 -0800)]
am
be2ed6d6: resolved conflicts for merge of
c96b6690 to gingerbread-plus-aosp
* commit '
be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=
d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=
3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
James Dong [Thu, 24 Feb 2011 18:11:46 +0000 (10:11 -0800)]
Merge "Fix MP3Extractor"
Glenn Kasten [Thu, 24 Feb 2011 18:01:31 +0000 (10:01 -0800)]
Merge "Bug
3362814 Fix SMP race in access to mRequestExit"
repo sync [Thu, 24 Feb 2011 17:58:25 +0000 (09:58 -0800)]
resolved conflicts for merge of
c96b6690 to gingerbread-plus-aosp
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
Alon Albert [Thu, 24 Feb 2011 17:20:46 +0000 (09:20 -0800)]
Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=
d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug b/issue?id=
3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread
Glenn Kasten [Thu, 24 Feb 2011 16:17:02 +0000 (08:17 -0800)]
Merge "Don't crash when parsing DRM MIME types"
Kristian Monsen [Thu, 24 Feb 2011 16:02:34 +0000 (08:02 -0800)]
Merge "Hiding deprecated classes and methods"
Derek Sollenberger [Thu, 24 Feb 2011 13:27:34 +0000 (05:27 -0800)]
Merge "Skia Merge (revision 808)"
Wu-cheng Li [Thu, 24 Feb 2011 10:51:17 +0000 (02:51 -0800)]
Merge "Add YV12 preview format to camera parameter constants."
Mathias Agopian [Thu, 17 Feb 2011 04:23:43 +0000 (20:23 -0800)]
Fix some issues with RefBase debugging.
First slipt sp<> out of RefBase into StrongPointer.h so it can be reused
more easily and to make it clear that it doesn't require RefBase.
Note: the rest of the change only affects the system when DEBUG_REFS is enabled.
The main problem we fix here is that the owner id associated with each
reference could get out of date when a sp<> or wp<> was moved, for
instance when they're used in a Vector< >.
We fix this issue by calling into RefBase::moveReferences from
a template specialization for sp<TYPE> and wp<TYPE> of the
type helpers. RefBase::moveReferences() has then a chance to
update the owner ids.
There is a little bit of trickery to implement this generically in
RefBase, where we need to use a templatized functor that can turn
a sp<TYPE>* casted to a void* into a RefBase*.
Introduced a new debug option DEBUG_REFS_FATAL_SANITY_CHECKS
currently set to 0 by default as there seem to be an issue
with sp<ANativeWindow> which trips the sanity checks.
Change-Id: I4825b21c8ec47d4a0ef35d760760ae0c9cdfbd7f
Xavier Ducrohet [Thu, 24 Feb 2011 02:32:15 +0000 (18:32 -0800)]
Merge "LayoutLib: Add debug mode."
Xavier Ducrohet [Thu, 24 Feb 2011 02:32:10 +0000 (18:32 -0800)]
Merge "LayoutLib: downsize the SparseArray when possible."
Jason Chen [Thu, 24 Feb 2011 02:11:21 +0000 (18:11 -0800)]
am
36b0b85a: (-s ours) am
22577b8d: (-s ours) am
5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '
36b0b85abd20b4f4bea210060dec3fbe80870dd5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB