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

41857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
271d668dfd Merge "docs: fix broken link" into ics-mr1 2012-02-22 16:20:49 -08:00
Jean-Baptiste Queru
e9df62ae5e am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility" 
* commit 'b92aee4e8c3d93235c9a57afa81711383538f54f':
  Add stubs for improved compatibility
 2012-02-22 12:36:35 -08:00
Jean-Baptiste Queru
1f3c23d7ee am 69e9c30c: Merge "Add stubs for improved compatibility" 
* commit '69e9c30c2641add74c9a3b02d0959c0ded9e66f7':
  Add stubs for improved compatibility
 2012-02-22 12:34:06 -08:00
Jean-Baptiste Queru
7cf89f1e78 Merge "Add stubs for improved compatibility" 2012-02-22 12:22:07 -08:00
Xavier Ducrohet
0e296c8425 am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
  Make sure resource references are resolved.
 2012-02-22 10:49:15 -08:00
Xavier Ducrohet
9bbfdcab00 Merge "Make sure resource references are resolved." into ics-mr1 2012-02-22 10:47:32 -08:00
Jean-Baptiste Queru
3eeb21dc44 am 2d03a93e: Merge "Xcode 4.3 compatibility checkin" 
* commit '2d03a93ecf00fb43272364293a21f88720884ce2':
  Xcode 4.3 compatibility checkin
 2012-02-22 10:17:24 -08:00
Jean-Baptiste Queru
080176c5ba am 4280891d: Merge "The bigger touch slop still has a problem" 
* commit '4280891dbc2cf60bdf51726e0aa9265ccb64ec88':
  The bigger touch slop still has a problem
 2012-02-22 09:56:27 -08:00
Jean-Baptiste Queru
7e7e13303d Merge "Xcode 4.3 compatibility checkin" 2012-02-22 09:54:40 -08:00
Jean-Baptiste Queru
66979ec297 Merge "The bigger touch slop still has a problem" 2012-02-22 09:10:43 -08:00
Rich Hyndman
031dfa82ee am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit '942b823ce4b2e0e11d395dffb2d340de01811612':
  docs: Added Lint into Android Training and removed Layoutopt.
 2012-02-22 03:43:21 -08:00
Rich Hyndman
862fa82bc9 Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 2012-02-22 03:41:05 -08:00
The Android Open Source Project
a79ef1fd22 Reconcile with ics-mr1-release 
Change-Id: Ibfaead4c0416959781113e6000356f954fe4cfb8
 2012-02-21 15:34:49 -08:00
The Android Automerger
17cfa90294 merge in ics-mr1-release history after reset to ics-mr1 2012-02-21 15:27:33 -08:00
The Android Open Source Project
6006cc28f9 Reconcile with ics-mr1-release 
Change-Id: I21e41892b352f1deeb7bef163d6b99217bb24a6b
 2012-02-21 15:06:33 -08:00
Dianne Hackborn
8f20e93718 am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
  Fix issue #6037252: Screen shifts after all apps are upgraded
 2012-02-21 14:57:46 -08:00
Jean-Baptiste Queru
46d34828dc am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'a91b052e16196436fcd3a24caa894718db4d10d6':
  Call onTimeChanged when AM/PM changed.
 2012-02-21 12:30:46 -08:00
Jean-Baptiste Queru
0ec4fc7f1a am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'fc24982a44d2b2b678fe5aa212b2e709d10e6413':
  Call onTimeChanged when AM/PM changed.
 2012-02-21 12:28:38 -08:00
Jean-Baptiste Queru
24ef414133 Merge "Call onTimeChanged when AM/PM changed." 2012-02-21 07:21:53 -08:00
Al Sutton
579c2b4dc1 Xcode 4.3 compatibility checkin 
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases

Signed-off-by: Al Sutton <al@funkyandroid.com>
 2012-02-19 08:31:19 +00:00
The Android Automerger
d661097a21 merge in ics-mr1-release history after reset to ics-mr1 2012-02-17 16:38:41 -08:00
Tsu Chiang Chuang
2c283a41cb am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
 2012-02-17 15:55:56 -08:00
Tsu Chiang Chuang
af139111ad Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Adam Powell
589760ba2c am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:25:29 -08:00
Jean-Baptiste Queru
9bae0ddd16 am 44c1f012: Merge "Return error code when composing PDU fails" 
* commit '44c1f012c4ffa75853a068963b212ee1c965b6ea':
  Return error code when composing PDU fails
 2012-02-17 13:18:34 -08:00
Jean-Baptiste Queru
77ffe4aa69 am c2461eb3: Merge "Add support for bmp and wav content types in MMS" 
* commit 'c2461eb32ebad522a946e9fef9c31e886d98124a':
  Add support for bmp and wav content types in MMS
 2012-02-17 13:18:31 -08:00
Jean-Baptiste Queru
125c4b9a95 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00
Jean-Baptiste Queru
651fdee192 Merge "Add support for bmp and wav content types in MMS" 2012-02-17 11:03:35 -08:00
Jean-Baptiste Queru
61cb633f43 am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit 'a1ee18f1413471813f36a1d05927f5513c8931f5':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:13:05 -08:00
Jean-Baptiste Queru
3429dad456 Merge "Increase PDU parts buffer size for performance reasons" 2012-02-17 09:53:29 -08:00
The Android Open Source Project
7442aa2c4c Reconcile with ics-mr1-release 
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
 2012-02-17 08:09:34 -08:00
Marc Blank
1eb99959e2 am 094bf51e: Use &#39; for apostrophe in HTML encoding DO NOT MERGE 
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use &#39; for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:54:41 -08:00
The Android Automerger
e2f93ba590 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 16:26:06 -08:00
Dianne Hackborn
ed9604b365 am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:44:03 -08:00
The Android Open Source Project
874c7db891 Reconcile with ics-mr1-release 
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
 2012-02-16 10:02:16 -08:00
The Android Automerger
04b944d66f merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 09:40:11 -08:00
Justin Ho
272b803811 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 
* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605
 2012-02-16 09:29:07 -08:00
Justin Ho
1e1a5d7820 Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 2012-02-16 09:27:05 -08:00