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
|
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
|
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
|
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
|
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 |
|
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 |
|
inazaruk
|
d387bb03e9
|
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:43 -08:00 |
|
Andrew Flynn
|
f1b552b6e0
|
Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop
|
2012-02-23 16:09:36 -08:00 |
|
Joe Fernandez
|
875401d5be
|
am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit '53c0d46d85a651093382a92466b0b0658ef1920c':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
|
2012-02-23 14:28:07 -08:00 |
|
Joe Fernandez
|
bf0139e189
|
am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
|
2012-02-23 14:25:01 -08:00 |
|
Joe Fernandez
|
892dd2e7a9
|
am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
|
2012-02-23 14:24:53 -08:00 |
|
Joe Fernandez
|
2ea80d5afa
|
Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
|
2012-02-23 14:22:41 -08:00 |
|
Jean-Baptiste Queru
|
32776d7222
|
am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit 'fe99051c78994e0cc5153468eeba6f75f3e04b8e':
Fix for issue 9656 - custom xml attributes in Android Libraries
|
2012-02-23 13:01:59 -08:00 |
|
Jean-Baptiste Queru
|
2ffe39d2a2
|
am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
Fix for issue 9656 - custom xml attributes in Android Libraries
|
2012-02-23 12:59:22 -08:00 |
|
Jean-Baptiste Queru
|
df8604cb86
|
am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
Fix for issue 9656 - custom xml attributes in Android Libraries
|
2012-02-23 12:57:03 -08:00 |
|
Jean-Baptiste Queru
|
0025dd37f5
|
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
|
2012-02-23 12:38:14 -08:00 |
|
Michael Jurka
|
13fd6d8c7b
|
am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'a7e1d8d5f7d16cd1004189f9aee727962790b8bf':
|
2012-02-23 08:11:45 -08:00 |
|
Michael Jurka
|
2405294349
|
am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '0a232673370989f54e05fd2508ce90267a54abd1':
Don't allow screen invalidations to go outside bounds of screen
|
2012-02-23 08:09:59 -08:00 |
|
Michael Jurka
|
1836a969f8
|
am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
Don't allow screen invalidations to go outside bounds of screen
|
2012-02-23 08:07:51 -08:00 |
|
Michael Jurka
|
2c672d6546
|
am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
Don't allow screen invalidations to go outside bounds of screen
|
2012-02-23 08:07:22 -08:00 |
|
Scott Main
|
0130c4ec7c
|
am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '2a24914caf7dd2906b0af3b82c40db5917b6e545':
|
2012-02-22 16:27:16 -08:00 |
|
Scott Main
|
2a980ecc12
|
am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit 'ce980d8ea0c4747ee23b05dfcc7c02655f595fde':
docs: fix broken link
|
2012-02-22 16:25:49 -08:00 |
|
Scott Main
|
3baead5c74
|
am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
docs: fix broken link
|
2012-02-22 16:23:04 -08:00 |
|
Scott Main
|
b38c4a66f3
|
am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
docs: fix broken link
|
2012-02-22 16:23:03 -08:00 |
|
Scott Main
|
271d668dfd
|
Merge "docs: fix broken link" into ics-mr1
|
2012-02-22 16:20:49 -08:00 |
|
Xavier Ducrohet
|
84001bdeac
|
am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '1f46d79faf1b947b3d169c336e013cea89e8de11':
|
2012-02-22 12:54:50 -08:00 |
|
Jean-Baptiste Queru
|
0fceb0db9e
|
am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"
* commit '1cd83102d4950327a6bd76f27b5d320d77e4bf84':
Add stubs for improved compatibility
|
2012-02-22 12:39:13 -08:00 |
|