OSDN Git Service
Romain Guy [Sat, 25 Feb 2012 02:01:22 +0000 (18:01 -0800)]
Merge "Add hooks to implement Canvas.drawTextOnPath() in GL"
Jason Sams [Sat, 25 Feb 2012 01:52:59 +0000 (17:52 -0800)]
Merge "Make compute work without an app context."
Gilles Debunne [Sat, 25 Feb 2012 01:42:03 +0000 (17:42 -0800)]
Merge "Fix NPE on Activity start in TextView"
Jason Sams [Sat, 25 Feb 2012 01:21:32 +0000 (17:21 -0800)]
Merge "Do RS caching the same way HardwareRenderer does. Eliminates the need for an application context for caching."
Jason Sams [Sat, 25 Feb 2012 01:21:02 +0000 (17:21 -0800)]
Merge "test runs but I do not check results yet."
Gilles Debunne [Sat, 25 Feb 2012 01:04:10 +0000 (17:04 -0800)]
Merge "Fix crash on long press in TextView"
Adam Powell [Sat, 25 Feb 2012 01:00:37 +0000 (17:00 -0800)]
Merge "Add support for optional titles in action modes"
Mathias Agopian [Sat, 25 Feb 2012 00:44:40 +0000 (16:44 -0800)]
Merge "remove libui dependency on libEGL"
Mathias Agopian [Sat, 25 Feb 2012 00:42:46 +0000 (16:42 -0800)]
remove libui dependency on libEGL
Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
Dianne Hackborn [Sat, 25 Feb 2012 00:42:14 +0000 (16:42 -0800)]
Dianne Hackborn [Sat, 25 Feb 2012 00:39:59 +0000 (16:39 -0800)]
Merge "resolved conflicts for merge of
34706a4c to master"
Dianne Hackborn [Sat, 25 Feb 2012 00:37:35 +0000 (16:37 -0800)]
resolved conflicts for merge of
34706a4c to master
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
James Dong [Sat, 25 Feb 2012 00:36:34 +0000 (16:36 -0800)]
Merge "Improved comment about DrmStore.ConstraintsColumns"
James Dong [Sat, 25 Feb 2012 00:35:20 +0000 (16:35 -0800)]
Merge "Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent"
Dianne Hackborn [Sat, 25 Feb 2012 00:29:44 +0000 (16:29 -0800)]
Dianne Hackborn [Sat, 25 Feb 2012 00:26:57 +0000 (16:26 -0800)]
am
e65a9ab1: am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
Fix build.
Dianne Hackborn [Sat, 25 Feb 2012 00:25:30 +0000 (16:25 -0800)]
am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
Dianne Hackborn [Sat, 25 Feb 2012 00:24:40 +0000 (16:24 -0800)]
am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
Dianne Hackborn [Sat, 25 Feb 2012 00:23:07 +0000 (16:23 -0800)]
Merge "Fix build." into ics-mr1
Dianne Hackborn [Fri, 24 Feb 2012 23:47:40 +0000 (15:47 -0800)]
am
92ce6314: am
140da7c4: am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
92ce6314c15bd6d59a94a247ae63f1da9b4ccab2':
Dianne Hackborn [Fri, 24 Feb 2012 23:44:55 +0000 (15:44 -0800)]
am
911b505f: am
dc5fa185: am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
911b505f11c719906985f169a4f45930bdec8695':
Fix issue #
6048808: sometimes auto-correct is inactive
Dianne Hackborn [Fri, 24 Feb 2012 23:42:43 +0000 (15:42 -0800)]
am
140da7c4: am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
140da7c4140f0536c3fad1f7be555ebd58055b63':
Dianne Hackborn [Fri, 24 Feb 2012 23:41:35 +0000 (15:41 -0800)]
am
dc5fa185: am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
dc5fa1859d03ecca36fc6be2fed7bbd4ba70b51f':
Fix issue #
6048808: sometimes auto-correct is inactive
Dianne Hackborn [Fri, 24 Feb 2012 23:38:07 +0000 (15:38 -0800)]
am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
133dc2d7aecc68990c363c861716b134910a4ced':
Fix issue #
6048808: sometimes auto-correct is inactive
Dianne Hackborn [Fri, 24 Feb 2012 23:38:03 +0000 (15:38 -0800)]
am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
133dc2d7aecc68990c363c861716b134910a4ced':
Fix issue #
6048808: sometimes auto-correct is inactive
Dianne Hackborn [Fri, 24 Feb 2012 23:36:33 +0000 (15:36 -0800)]
Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
Mathias Agopian [Fri, 24 Feb 2012 23:09:54 +0000 (15:09 -0800)]
Merge "deprecate L_8, LA_88 and RGB_332 in sdk"
Robert Greenwalt [Fri, 24 Feb 2012 23:02:30 +0000 (15:02 -0800)]
Merge "Seperate RIL constants from the framework."
Mathias Agopian [Fri, 24 Feb 2012 22:58:36 +0000 (14:58 -0800)]
deprecate L_8, LA_88 and RGB_332 in sdk
re-add support for pixelformats L_8, LA_88 and RGB_332 in libui
for backward compatibility.
This may or may not fix
6058926
Bug:
6049685
Change-Id: Ic1b8b4cc994522f7fe664da64c0ef76b98bc6d53
Glenn Kasten [Fri, 24 Feb 2012 22:25:15 +0000 (14:25 -0800)]
Merge "Pull CPU statistics code out of threadLoop()"
The Android Open Source Project [Fri, 24 Feb 2012 22:14:47 +0000 (14:14 -0800)]
The Android Open Source Project [Fri, 24 Feb 2012 22:12:35 +0000 (14:12 -0800)]
am
2ddd7b3e: Reconcile with ics-mr1-release
* commit '
2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':
The Android Open Source Project [Fri, 24 Feb 2012 22:05:51 +0000 (14:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
The Android Open Source Project [Fri, 24 Feb 2012 22:04:16 +0000 (14:04 -0800)]
Andreas Huber [Fri, 24 Feb 2012 22:03:27 +0000 (14:03 -0800)]
Merge "Make sure we return input/output buffers to the codec not just while"
Andreas Huber [Fri, 24 Feb 2012 22:02:52 +0000 (14:02 -0800)]
Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm"
The Android Open Source Project [Fri, 24 Feb 2012 22:01:27 +0000 (14:01 -0800)]
am
aac21480: Reconcile with ics-mr1-release
* commit '
aac214800b518259306960ff9cc90de65d095398':
The Android Open Source Project [Fri, 24 Feb 2012 21:57:46 +0000 (13:57 -0800)]
Reconcile with ics-mr1-release
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
Glenn Kasten [Fri, 24 Feb 2012 21:17:36 +0000 (13:17 -0800)]
Merge "Remove TrackBase::mFlags"
Svetoslav Ganov [Fri, 24 Feb 2012 19:33:46 +0000 (11:33 -0800)]
Merge "Regression: Cannot query the content of certain windows."
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:11:10 +0000 (11:11 -0800)]
am
ed7e1e83: am
47023027: am
26d9944e: am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
ed7e1e830165678421ee7d1b3dac044214a6e635':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:07:45 +0000 (11:07 -0800)]
am
47023027: am
26d9944e: am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
470230275431c8ae85debc3c089b6942c55fef0f':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:05:15 +0000 (11:05 -0800)]
am
26d9944e: am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
26d9944e3f75123708ef0cfb158f48709348a361':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:02:29 +0000 (11:02 -0800)]
am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
6a300a5413898ff8b728e77c5a23290cae60e9b5':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Daniel Sandler [Fri, 24 Feb 2012 18:53:42 +0000 (10:53 -0800)]
Merge "New notification priority and related APIs."
Svetoslav Ganov [Fri, 24 Feb 2012 18:52:10 +0000 (10:52 -0800)]
Merge "UiTestAutomationBridge does not terminate its HandlerThread."
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:35:47 +0000 (10:35 -0800)]
am
70450553: am
14c6e272: am
2accfc11: am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
70450553f8f1e6ec4967f86a4b811db2940e8772':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:33:05 +0000 (10:33 -0800)]
am
78fc0c0b: am
428ece23: am
c4aa19a5: am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
78fc0c0bfae913a4a44011225396ae525b335fb1':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:32:34 +0000 (10:32 -0800)]
am
14c6e272: am
2accfc11: am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
14c6e2728c2ae39aab6fc9a9a77c402d7322afc0':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:30:12 +0000 (10:30 -0800)]
am
428ece23: am
c4aa19a5: am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
428ece23f414d288981ea0ac8f326e9e71a57959':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:29:45 +0000 (10:29 -0800)]
am
2accfc11: am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
2accfc110a71add56f5e4c35228e88dfa3024676':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:28:00 +0000 (10:28 -0800)]
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:27:06 +0000 (10:27 -0800)]
am
c4aa19a5: am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
c4aa19a578b8a11bea225994c58116b407e63a69':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:26:53 +0000 (10:26 -0800)]
am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
d6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:24:34 +0000 (10:24 -0800)]
am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
ea227787253e29da2d688399b097e05708d3bf73':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Svetoslav Ganov [Fri, 24 Feb 2012 18:23:06 +0000 (10:23 -0800)]
Merge "AccessibilityNodeInfos node properly cached."
John Reck [Fri, 24 Feb 2012 18:22:56 +0000 (10:22 -0800)]
Merge "Fix HitTest type detection"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:22:33 +0000 (10:22 -0800)]
Merge "stagefright aacenc: Fix an inline asm constraint"
Andreas Huber [Fri, 24 Feb 2012 18:16:28 +0000 (10:16 -0800)]
Merge "Small fix to MediaCodec"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:07:47 +0000 (10:07 -0800)]
Merge changes I903353c5,I822dcc74
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:03:47 +0000 (10:03 -0800)]
am
15278119: am
61022b06: am
5f83b957: am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
1527811984557ee0b5d6e476e84ed147e073cb45':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:00:56 +0000 (10:00 -0800)]
am
61022b06: am
5f83b957: am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
61022b06a352e5a6da382a09f51ea624581ada7f':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:57:51 +0000 (09:57 -0800)]
am
5f83b957: am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
5f83b95705fa84b87b498d67f3b1b8dc34038474':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:54:58 +0000 (09:54 -0800)]
am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:52:54 +0000 (09:52 -0800)]
am
4de803c7: am
459df4ef: am
e7650c32: am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
4de803c76d4afd0f542c086b555b71729b3c5796':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:50:27 +0000 (09:50 -0800)]
am
459df4ef: am
e7650c32: am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
459df4ef8368ea84ce7d07981c6867a7b7fef14e':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:48:14 +0000 (09:48 -0800)]
am
e7650c32: am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
e7650c327980f15c6cd53ad0081a54d78c3248f0':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:47:22 +0000 (09:47 -0800)]
Merge "stagefright aacenc: Zero-initialize a struct"
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:45:40 +0000 (09:45 -0800)]
am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:28:09 +0000 (09:28 -0800)]
am
307f47aa: am
7e8b65df: am
7ffa4546: am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
307f47aa5def85d0c0bb4af725ff557707c5be86':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:25:34 +0000 (09:25 -0800)]
am
7e8b65df: am
7ffa4546: am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
7e8b65dfbaaf1e5901e49e048f92b19c184eabe4':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:23:23 +0000 (09:23 -0800)]
am
7ffa4546: am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
7ffa4546de0b9e22b4896731cdfd1655f61a0b6c':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:44 +0000 (09:20 -0800)]
am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:36 +0000 (09:20 -0800)]
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:12:17 +0000 (09:12 -0800)]
am
5c2f1220: am
901b8bb0: am
aa86aa60: am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
5c2f1220f90ae68a064195ba3c94f1319813f32c':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:57:40 +0000 (08:57 -0800)]
am
901b8bb0: am
aa86aa60: am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
901b8bb09ffdb0c64c0a8522016ffc1da6358a92':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:53:30 +0000 (08:53 -0800)]
am
aa86aa60: am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:53:24 +0000 (08:53 -0800)]
Merge "stagefright aacenc: Add const declarations to some pointers"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:50:32 +0000 (08:50 -0800)]
am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:38:22 +0000 (08:38 -0800)]
Merge "stagefright aacenc: Fix inline asm"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:01:10 +0000 (08:01 -0800)]
am
0c96e869: am
41087f79: am
d7ab4e0c: am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
0c96e8690408e3cfc12eee521a442c52f1c10b27':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:59:05 +0000 (07:59 -0800)]
am
41087f79: am
d7ab4e0c: am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
41087f7920196f81a50f320c9d538b36534f178d':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:55:59 +0000 (07:55 -0800)]
am
d7ab4e0c: am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
d7ab4e0c42a34331620c63c8c58d0dabc658eb1a':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:53:43 +0000 (07:53 -0800)]
am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:39:02 +0000 (07:39 -0800)]
Merge "stagefright aacenc: Fix inline asm constraints"
George Mount [Fri, 24 Feb 2012 15:29:13 +0000 (07:29 -0800)]
Merge "Disable selection when nothing selected."
Michael Jurka [Fri, 24 Feb 2012 07:58:30 +0000 (23:58 -0800)]
Merge "Fix blip after notifications are swiped"
Mathias Agopian [Fri, 24 Feb 2012 05:23:02 +0000 (21:23 -0800)]
Merge changes I97807db6,I7d350bc0
* changes:
workaround for an issue where the screen would flicker sometimes
fix an issue in SF where we could miss some updates
Mathias Agopian [Fri, 24 Feb 2012 05:20:01 +0000 (21:20 -0800)]
workaround for an issue where the screen would flicker sometimes
bug:
6020860
Change-Id: I97807db66b66c5f4dcbed0df79d5d257cfc7c0bd
Mathias Agopian [Fri, 24 Feb 2012 04:05:39 +0000 (20:05 -0800)]
fix an issue in SF where we could miss some updates
Change-Id: I7d350bc05d1596655baddff3deaebaba58c9bcc0
James Dong [Fri, 24 Feb 2012 05:00:59 +0000 (21:00 -0800)]
Merge "Changed TimedTextInBandSource to TimedText3GPPSource."
John Reck [Fri, 24 Feb 2012 03:28:20 +0000 (19:28 -0800)]
Merge "Support email and phone types"
Svetoslav Ganov [Fri, 24 Feb 2012 03:04:41 +0000 (19:04 -0800)]
Merge "Fixing issues with the AccessibilityNodeInfo cache."
Xavier Ducrohet [Fri, 24 Feb 2012 02:49:51 +0000 (18:49 -0800)]
am
1704a5cc: (-s ours) am
f31297ed: am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
1704a5cc59c501fab53dbd2e754a8479ac1f57ca':
inazaruk [Fri, 24 Feb 2012 02:49:47 +0000 (18:49 -0800)]
am
737d6ef5: (-s ours) am
68ad43e1: am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
737d6ef5f1b545f3fc3bb0d839abc9a421760ed1':
Andrew Flynn [Fri, 24 Feb 2012 02:49:44 +0000 (18:49 -0800)]
am
206be012: (-s ours) am
ec63cd85: Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop
* commit '
206be012b4ea7c57493ac7668bb09172758acbde':
DO NOT MERGE Return 1.5 * density as default for large screens.
Joe Fernandez [Fri, 24 Feb 2012 02:49:41 +0000 (18:49 -0800)]
am
e2b98cf3: am
c6e3f6f1: am
566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
* commit '
e2b98cf359c82a2c4181c1d9cd1d9130bd96be66':
Xavier Ducrohet [Fri, 24 Feb 2012 02:47:08 +0000 (18:47 -0800)]
am
54c8c3d9: (-s ours) am
b3c780f1: am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
54c8c3d920ee863716638483602a011943da6484':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:47:06 +0000 (18:47 -0800)]
am
85eb3f0a: (-s ours) am
9694910e: am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
85eb3f0af00aa35cceebbf162de4434418bf5a84':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:45:56 +0000 (18:45 -0800)]
am
f31297ed: am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
f31297edf899997dc9f173f6ddca30b0e4f2d677':