ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
41,973 Commits 2 Branches 0 Tags 54 MiB
a421bf78ac
Commit Graph

41973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
2b37af478f merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 16:10:06 -08:00
Jean-Baptiste Queru
2d0b5dad97 am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" 
* commit '015a248e631dc10fd6b52ae8773c0a3e0cf752af':
  Add stubs for better compatibility
 2012-02-27 16:01:31 -08:00
Jean-Baptiste Queru
6a22ed0a4b am 93df415c: Merge "Add stubs for better compatibility" 
* commit '93df415c1e0b4c99f274adb3629ce19abf1d0f53':
  Add stubs for better compatibility
 2012-02-27 15:58:50 -08:00
Jean-Baptiste Queru
47e81bd44d Merge "Add stubs for better compatibility" 2012-02-27 15:36:22 -08:00
The Android Automerger
6399e0a1e8 merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 14:42:58 -08:00
Jean-Baptiste Queru
7db82ac832 am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 
* commit 'faf38b24c0255ea7492277b0aa03a401dbdbb2b8':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
 2012-02-27 13:10:10 -08:00
Jean-Baptiste Queru
a4213e166f am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit '163777b8be102a10f6e4a4a6c5be90eed2a479d2':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:10:07 -08:00
Jean-Baptiste Queru
c6e21639c0 am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 
* commit 'ded8e6818dbec3f1a6589345f0d8d6b189e1ea2b':
  stagefright amrwb: Change a C++ style cast into a C style cast
 2012-02-27 13:10:04 -08:00
Jean-Baptiste Queru
f3fa0a2d43 am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* commit 'd91b744dedaa19a42ea9d878cfa5925cb15b2698':
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
 2012-02-27 13:10:00 -08:00
Jean-Baptiste Queru
c77f096dea am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:09:57 -08:00
Jean-Baptiste Queru
d795296c8d am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '7346d73cac355f2b05051450eb1059d5e11e4ffb':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:09:53 -08:00
Jean-Baptiste Queru
54cbaaa869 am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit '32901b397b590cc9133d21caab20b5ef01f0dd04':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:09:50 -08:00
Jean-Baptiste Queru
8cf0614965 am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" 
* commit '716a051719993cae576590f6a43620697e50b3b5':
  stagefright amrwb: Make a global const array static
 2012-02-27 13:09:46 -08:00
Jean-Baptiste Queru
23732c449e am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit 'c1da1e1b2f18896c65df85de93a07680175c5277':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:09:43 -08:00
Jean-Baptiste Queru
f5231683b1 am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" 
* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
 2012-02-27 13:09:40 -08:00
Jean-Baptiste Queru
3dd0b85008 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 
* commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
 2012-02-27 13:07:43 -08:00
Jean-Baptiste Queru
c4d226afb1 am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:07:40 -08:00
Jean-Baptiste Queru
4684d4b4d8 am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 
* commit '695cfe1e1e189f176fdf994f72d05a0129a66394':
  stagefright amrwb: Change a C++ style cast into a C style cast
 2012-02-27 13:07:36 -08:00
Jean-Baptiste Queru
cc1e3f6e44 am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* commit 'f7f1280e0c71d64098efb42b58a922d056164b5e':
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
 2012-02-27 13:07:33 -08:00
Jean-Baptiste Queru
4bbb0664c0 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:07:30 -08:00
Jean-Baptiste Queru
1da7c45902 am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '77576ff487e227092cdaf09db163e21f1e07604a':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:07:26 -08:00
Jean-Baptiste Queru
313019d1ad am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:07:23 -08:00
Jean-Baptiste Queru
1a9265d7fd am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" 
* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
  stagefright amrwb: Make a global const array static
 2012-02-27 13:07:20 -08:00
Jean-Baptiste Queru
2f6ac77fe0 am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:07:16 -08:00
Jean-Baptiste Queru
f2b5df8a52 am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" 
* commit '5aff259c61e54e441ed04bf77e3cc69a0374432d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
 2012-02-27 13:07:12 -08:00
Jean-Baptiste Queru
ccfe22f83d Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
64485b7fc7 Merge "stagefright amrwb: Make local const arrays static" 2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
6a28648990 Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 2012-02-27 12:13:27 -08:00
Jean-Baptiste Queru
c8ebd8e9a8 Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* changes:
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
 2012-02-27 11:16:23 -08:00
Jean-Baptiste Queru
0470e9d4d1 Merge "stagefright aacenc: Simplify the definition of __inline" 2012-02-27 11:11:57 -08:00
Jean-Baptiste Queru
c95d442ac5 Merge "stagefright amrwbenc: Remove a useless check" 2012-02-27 11:11:18 -08:00
Jean-Baptiste Queru
3e9a9416df Merge "stagefright aacenc: Remove a stray semicolon" 2012-02-27 11:09:59 -08:00
Jean-Baptiste Queru
8f420aeefc Merge "stagefright amrwb: Make a global const array static" 2012-02-27 11:08:09 -08:00
Jean-Baptiste Queru
d98681e6cc Merge "stagefright amrwbenc: Change keyword ordering" 2012-02-27 11:06:25 -08:00
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
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
da41bcdb70 Merge "docs: fix bug 5990526" into ics-mr1 2012-02-27 08:40:54 -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
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
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
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
bb4bcfc028 Reconcile with ics-mr1-release 
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
 2012-02-24 13:57:46 -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
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