John Reck
|
a7a6190be9
|
Merge "Fix HitTest type detection"
|
2012-02-24 10:22:56 -08:00 |
|
Andreas Huber
|
37f1a39f3b
|
Merge "Small fix to MediaCodec"
|
2012-02-24 10:16:28 -08:00 |
|
Jean-Baptiste Queru
|
4cb6eca476
|
am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '1527811984557ee0b5d6e476e84ed147e073cb45':
stagefright aacenc: Zero-initialize a struct
|
2012-02-24 10:03:47 -08:00 |
|
Jean-Baptiste Queru
|
754e9d92b7
|
am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '61022b06a352e5a6da382a09f51ea624581ada7f':
stagefright aacenc: Zero-initialize a struct
|
2012-02-24 10:00:56 -08:00 |
|
Jean-Baptiste Queru
|
f5442ba965
|
am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '5f83b95705fa84b87b498d67f3b1b8dc34038474':
stagefright aacenc: Zero-initialize a struct
|
2012-02-24 09:57:51 -08:00 |
|
Jean-Baptiste Queru
|
107e2c7b64
|
am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
|
2012-02-24 09:54:58 -08:00 |
|
Jean-Baptiste Queru
|
64c6b9d421
|
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
|
2012-02-24 09:52:54 -08:00 |
|
Jean-Baptiste Queru
|
afe1786ba1
|
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
|
2012-02-24 09:50:27 -08:00 |
|
Jean-Baptiste Queru
|
3b76648057
|
am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit 'e7650c327980f15c6cd53ad0081a54d78c3248f0':
stagefright aacenc: Avoid warnings about incompatible pointer types
|
2012-02-24 09:48:14 -08:00 |
|
Jean-Baptiste Queru
|
b36440d1d5
|
Merge "stagefright aacenc: Zero-initialize a struct"
|
2012-02-24 09:47:23 -08:00 |
|
Jean-Baptiste Queru
|
b445a23c74
|
am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
|
2012-02-24 09:45:40 -08:00 |
|
Jean-Baptiste Queru
|
999a700730
|
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
|
2012-02-24 09:28:09 -08:00 |
|
Jean-Baptiste Queru
|
ea00944a4f
|
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
|
2012-02-24 09:25:34 -08:00 |
|
Jean-Baptiste Queru
|
8d9d3f917e
|
am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '7ffa4546de0b9e22b4896731cdfd1655f61a0b6c':
stagefright aacenc: Add const declarations to some pointers
|
2012-02-24 09:23:23 -08:00 |
|
Jean-Baptiste Queru
|
be444488fc
|
am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
|
2012-02-24 09:20:44 -08:00 |
|
Jean-Baptiste Queru
|
69ce038818
|
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
|
2012-02-24 09:20:37 -08:00 |
|
Jean-Baptiste Queru
|
b76e45bd85
|
am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '5c2f1220f90ae68a064195ba3c94f1319813f32c':
stagefright aacenc: Fix inline asm
|
2012-02-24 09:12:17 -08:00 |
|
Jean-Baptiste Queru
|
aad718b998
|
am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '901b8bb09ffdb0c64c0a8522016ffc1da6358a92':
stagefright aacenc: Fix inline asm
|
2012-02-24 08:57:40 -08:00 |
|
Jean-Baptiste Queru
|
39ad1a1f6f
|
am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit 'aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
stagefright aacenc: Fix inline asm
|
2012-02-24 08:53:30 -08:00 |
|
Jean-Baptiste Queru
|
adae87846c
|
Merge "stagefright aacenc: Add const declarations to some pointers"
|
2012-02-24 08:53:25 -08:00 |
|
Jean-Baptiste Queru
|
e5cd6d2404
|
am 1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
|
2012-02-24 08:50:32 -08:00 |
|
Jean-Baptiste Queru
|
026b1b26e5
|
Merge "stagefright aacenc: Fix inline asm"
|
2012-02-24 08:38:23 -08:00 |
|
Jean-Baptiste Queru
|
d48dfdaaed
|
am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '0c96e8690408e3cfc12eee521a442c52f1c10b27':
stagefright aacenc: Fix inline asm constraints
|
2012-02-24 08:01:10 -08:00 |
|
Jean-Baptiste Queru
|
a29ae9e97f
|
am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '41087f7920196f81a50f320c9d538b36534f178d':
stagefright aacenc: Fix inline asm constraints
|
2012-02-24 07:59:05 -08:00 |
|
Jean-Baptiste Queru
|
615c616f34
|
am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit 'd7ab4e0c42a34331620c63c8c58d0dabc658eb1a':
stagefright aacenc: Fix inline asm constraints
|
2012-02-24 07:55:59 -08:00 |
|
Jean-Baptiste Queru
|
f82acd2f35
|
am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
|
2012-02-24 07:53:43 -08:00 |
|
Jean-Baptiste Queru
|
63f2b75928
|
Merge "stagefright aacenc: Fix inline asm constraints"
|
2012-02-24 07:39:03 -08:00 |
|
George Mount
|
4bc887d0c7
|
Merge "Disable selection when nothing selected."
|
2012-02-24 07:29:13 -08:00 |
|
Michael Jurka
|
6fc28852ef
|
Merge "Fix blip after notifications are swiped"
|
2012-02-23 23:58:30 -08:00 |
|
Mathias Agopian
|
0c76ba2dd9
|
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
|
2012-02-23 21:23:02 -08:00 |
|
Mathias Agopian
|
fbc7922ec8
|
workaround for an issue where the screen would flicker sometimes
bug: 6020860
Change-Id: I97807db66b66c5f4dcbed0df79d5d257cfc7c0bd
|
2012-02-23 21:20:01 -08:00 |
|
Mathias Agopian
|
4d143eed99
|
fix an issue in SF where we could miss some updates
Change-Id: I7d350bc05d1596655baddff3deaebaba58c9bcc0
|
2012-02-23 21:17:01 -08:00 |
|
James Dong
|
74ace176fa
|
Merge "Changed TimedTextInBandSource to TimedText3GPPSource."
|
2012-02-23 21:00:59 -08:00 |
|
John Reck
|
bf0dc6375c
|
Merge "Support email and phone types"
|
2012-02-23 19:28:20 -08:00 |
|
Svetoslav Ganov
|
5f07ad3991
|
Merge "Fixing issues with the AccessibilityNodeInfo cache."
|
2012-02-23 19:04:41 -08:00 |
|
Xavier Ducrohet
|
a914061855
|
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':
|
2012-02-23 18:49:51 -08:00 |
|
inazaruk
|
56498ad7cf
|
am 737d6ef5: (-s ours) am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '737d6ef5f1b545f3fc3bb0d839abc9a421760ed1':
|
2012-02-23 18:49:47 -08:00 |
|
Andrew Flynn
|
585a03b104
|
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.
|
2012-02-23 18:49:44 -08:00 |
|
Joe Fernandez
|
1db92ad48e
|
am e2b98cf3: am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit 'e2b98cf359c82a2c4181c1d9cd1d9130bd96be66':
|
2012-02-23 18:49:41 -08:00 |
|
Xavier Ducrohet
|
7434d28600
|
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.
|
2012-02-23 18:47:08 -08:00 |
|
inazaruk
|
5c8dd44fbc
|
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.
|
2012-02-23 18:47:06 -08:00 |
|
Xavier Ducrohet
|
7a5798987a
|
am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit 'f31297edf899997dc9f173f6ddca30b0e4f2d677':
|
2012-02-23 18:45:56 -08:00 |
|
inazaruk
|
27c4a423c2
|
am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '68ad43e10ba76721295e66b746c5f5c5e7094a0b':
|
2012-02-23 18:45:53 -08:00 |
|
Andrew Flynn
|
df8309be23
|
am ec63cd85: Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop
* commit 'ec63cd85c8b7f90a39e04aeec560fea7ea973b9a':
DO NOT MERGE Return 1.5 * density as default for large screens.
|
2012-02-23 18:45:52 -08:00 |
|
Joe Fernandez
|
4a425fb9e8
|
am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit 'c6e3f6f1a758a91d486cbcebb8241f8413c6e770':
|
2012-02-23 18:45:51 -08:00 |
|
Xavier Ducrohet
|
85492ed98e
|
am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit 'b3c780f16c37d2fb41a4eb211ea062b4c0b4e366':
Move the automatic namespace outside of the res namespace. do not merge.
|
2012-02-23 18:44:16 -08:00 |
|
inazaruk
|
279c0bde30
|
am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '9694910e17a18c307e61811284f88a26db2bfbae':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
|
2012-02-23 18:44:14 -08:00 |
|
Xavier Ducrohet
|
f2670fd138
|
am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
|
2012-02-23 18:42:01 -08:00 |
|
inazaruk
|
4467207a96
|
am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
|
2012-02-23 18:41:54 -08:00 |
|
Xavier Ducrohet
|
aafceff69f
|
am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
|
2012-02-23 18:41:48 -08:00 |
|