Jean-Baptiste Queru
98fc51d885
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
2012-02-27 10:58:51 -08:00
Jean-Baptiste Queru
1f7cd76f0a
Add stubs for better compatibility
...
Change-Id: I3fafee637f3ab239e3b870c73bcfe34cf73caf4c
2012-02-27 08:54:57 -08:00
Robert Ly
89991c09dd
am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit 'c76ca242ce2bd26c97c78ddf6842429850f541d9':
docs: fix bug 5990526
2012-02-27 08:46:00 -08:00
Robert Ly
d5a1b94143
am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug 5990526
2012-02-27 08:42:48 -08:00
Robert Ly
2e6ca38769
am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug 5990526
2012-02-27 08:42:19 -08:00
Robert Ly
da41bcdb70
Merge "docs: fix bug 5990526" into ics-mr1
2012-02-27 08:40:54 -08:00
Xavier Ducrohet
c021cc4c4c
am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit 'df154866fbad10faf8f9bceb8843aca1e2a69984':
2012-02-24 19:36:34 -08:00
Xavier Ducrohet
ff5141ab9c
am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit 'f038868d74af534effceaa8f1d932f9576f4f647':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:35:25 -08:00
Xavier Ducrohet
33979d4dd6
am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:32:47 -08:00
Xavier Ducrohet
dafc347bba
am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:32:32 -08:00
Dianne Hackborn
bf9473b430
am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':
2012-02-24 16:29:44 -08:00
Dianne Hackborn
de3f69a237
am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
Fix build.
2012-02-24 16:26:57 -08:00
Dianne Hackborn
2f171c6e50
am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
2012-02-24 16:25:30 -08:00
Dianne Hackborn
126004dade
am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
2012-02-24 16:24:40 -08:00
Dianne Hackborn
49b0cca899
Merge "Fix build." into ics-mr1
2012-02-24 16:23:07 -08:00
Dianne Hackborn
5d5f8054dc
am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808 : sometimes auto-correct is inactive" into ics-mr1
...
* commit '140da7c4140f0536c3fad1f7be555ebd58055b63':
2012-02-24 15:42:43 -08:00
Dianne Hackborn
28857486a4
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
2012-02-24 15:41:35 -08:00
Dianne Hackborn
7a519dfe47
am 133dc2d7: Merge "Fix issue #6048808 : sometimes auto-correct is inactive" into ics-mr1
...
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
Fix issue #6048808 : sometimes auto-correct is inactive
2012-02-24 15:38:07 -08:00
Dianne Hackborn
651a8f4bf9
am 133dc2d7: Merge "Fix issue #6048808 : sometimes auto-correct is inactive" into ics-mr1
...
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
Fix issue #6048808 : sometimes auto-correct is inactive
2012-02-24 15:38:03 -08:00
Dianne Hackborn
a270567a78
Merge "Fix issue #6048808 : sometimes auto-correct is inactive" into ics-mr1
2012-02-24 15:36:33 -08:00
The Android Open Source Project
b5110d49e6
am 2ddd7b3e: Reconcile with ics-mr1-release
...
* commit '2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':
2012-02-24 14:12:35 -08:00
The Android Open Source Project
8210d88c03
Reconcile with ics-mr1-release
...
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
2012-02-24 14:05:51 -08:00
The Android Open Source Project
c7b46b6260
am aac21480: Reconcile with ics-mr1-release
...
* commit 'aac214800b518259306960ff9cc90de65d095398':
2012-02-24 14:01:27 -08:00
The Android Open Source Project
bb4bcfc028
Reconcile with ics-mr1-release
...
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
2012-02-24 13:57:46 -08:00
Jean-Baptiste Queru
b3a5ddc098
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
2012-02-24 11:07:45 -08:00
Jean-Baptiste Queru
f50a9dc7bb
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
2012-02-24 11:05:15 -08:00
Jean-Baptiste Queru
8ebb94eb7e
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
2012-02-24 11:02:29 -08:00
Jean-Baptiste Queru
5a5fafcc79
am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
...
* commit '14c6e2728c2ae39aab6fc9a9a77c402d7322afc0':
stagefright aacenc: Fix an inline asm constraint
2012-02-24 10:32:34 -08:00
Jean-Baptiste Queru
57408cc033
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
2012-02-24 10:30:12 -08:00
Jean-Baptiste Queru
0827014e5a
am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
...
* commit '2accfc110a71add56f5e4c35228e88dfa3024676':
stagefright aacenc: Fix an inline asm constraint
2012-02-24 10:29:45 -08:00
Jean-Baptiste Queru
9f32cdb3ae
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
332c28848f
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
2012-02-24 10:27:06 -08:00
Jean-Baptiste Queru
c89356e2f2
am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
...
* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
2012-02-24 10:26:53 -08:00
Jean-Baptiste Queru
a7ea406dc9
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
2012-02-24 10:24:34 -08:00
Jean-Baptiste Queru
3815cf38ad
Merge "stagefright aacenc: Fix an inline asm constraint"
2012-02-24 10:22:34 -08:00
Jean-Baptiste Queru
3f10c2513e
Merge changes I903353c5,I822dcc74
...
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:07:49 -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
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