- 3dd0b85 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
- c4d226a am 354ac772: Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
- 4684d4b am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
- cc1e3f6 am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
- 4bbb066 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
- 1da7c45 am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
- 313019d am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
- 1a9265d am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
- 2f6ac77 am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
- f2b5df8 am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
- ccfe22f Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
- 64485b7 Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
- 6a28648 Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
- c8ebd8e Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
- 0470e9d Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
- c95d442 Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
- 3e9a941 Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
- 8f420ae Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
- d98681e Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
- 98fc51d Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
- bb4bcfc Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- f50a9dc am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
- 8ebb94e am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
- 0827014 am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- 9f32cdb Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
- 332c288 am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
- c89356e am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- a7ea406 am ea227787: Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
- 3815cf3 Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- 3f10c25 Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
- f5442ba am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
- 107e2c7 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
- 3b76648 am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
- b36440d Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
- b445a23 am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
- 8d9d3f9 am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
- be44448 am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
- 69ce038 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
- 39ad1a1 am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
- adae878 Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
- e5cd6d2 am 1b704610: Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
- 026b1b2 Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
- 615c616 am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
- f82acd2 am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
- 63f2b75 Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
- f2670fd am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. by Xavier Ducrohet · 13 years ago
- 4467207 am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. by inazaruk · 13 years ago
- bf0139e am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 by Joe Fernandez · 13 years ago
- 2ea80d5 Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 by Joe Fernandez · 13 years ago
- 2ffe39d am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" by Jean-Baptiste Queru · 13 years ago
- df8604c am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" by Jean-Baptiste Queru · 13 years ago
- 0025dd3 Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" by Jean-Baptiste Queru · 13 years ago
- 15fe078 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
- 2c672d6 am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen by Michael Jurka · 13 years ago
- 3baead5 am 68d97aa2: Merge "docs: fix broken link" into ics-mr1 by Scott Main · 13 years ago
- 271d668 Merge "docs: fix broken link" into ics-mr1 by Scott Main · 13 years ago
- e9df62a am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility" by Jean-Baptiste Queru · 13 years ago
- 1f3c23d am 69e9c30c: Merge "Add stubs for improved compatibility" by Jean-Baptiste Queru · 13 years ago
- 7cf89f1 Merge "Add stubs for improved compatibility" by Jean-Baptiste Queru · 13 years ago
- 0e296c8 am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 by Xavier Ducrohet · 13 years ago
- 9bbfdca Merge "Make sure resource references are resolved." into ics-mr1 by Xavier Ducrohet · 13 years ago
- 3eeb21d am 2d03a93e: Merge "Xcode 4.3 compatibility checkin" by Jean-Baptiste Queru · 13 years ago
- 080176c am 4280891d: Merge "The bigger touch slop still has a problem" by Jean-Baptiste Queru · 13 years ago
- 7e7e133 Merge "Xcode 4.3 compatibility checkin" by Jean-Baptiste Queru · 13 years ago
- 66979ec Merge "The bigger touch slop still has a problem" by Jean-Baptiste Queru · 13 years ago
- 031dfa8 am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 by Rich Hyndman · 13 years ago
- 862fa82 Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 by Rich Hyndman · 13 years ago
- a79ef1f Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- 17cfa90 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
- 6006cc2 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- 8f20e93 am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded by Dianne Hackborn · 13 years ago
- 46d3482 am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed." by Jean-Baptiste Queru · 13 years ago
- 0ec4fc7 am fc24982a: Merge "Call onTimeChanged when AM/PM changed." by Jean-Baptiste Queru · 13 years ago
- 24ef414 Merge "Call onTimeChanged when AM/PM changed." by Jean-Baptiste Queru · 13 years ago
- 579c2b4 Xcode 4.3 compatibility checkin by Al Sutton · 13 years ago
- d661097 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
- 2c283a4 am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
- af13911 Merge "fix NPE in race condition." into ics-mr1 by Tsu Chiang Chuang · 13 years ago
- 589760b am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks by Adam Powell · 13 years ago
- 9bae0dd am 44c1f012: Merge "Return error code when composing PDU fails" by Jean-Baptiste Queru · 13 years ago
- 77ffe4a am c2461eb3: Merge "Add support for bmp and wav content types in MMS" by Jean-Baptiste Queru · 13 years ago
- 125c4b9 Merge "Return error code when composing PDU fails" by Jean-Baptiste Queru · 13 years ago
- 651fdee Merge "Add support for bmp and wav content types in MMS" by Jean-Baptiste Queru · 13 years ago
- 61cb633 am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" by Jean-Baptiste Queru · 13 years ago
- 3429dad Merge "Increase PDU parts buffer size for performance reasons" by Jean-Baptiste Queru · 13 years ago
- 7442aa2 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- 1eb9995 am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE by Marc Blank · 13 years ago
- e2f93ba merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
- ed9604b am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. by Dianne Hackborn · 13 years ago
- 874c7db Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- 04b944d merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
- 272b803 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 by Justin Ho · 13 years ago
- 1e1a5d7 Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 by Justin Ho · 13 years ago
- 7dee7fb am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 by Justin Ho · 13 years ago
- c7e551a Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 by Justin Ho · 13 years ago
- e8bea79 am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; by Scott Main · 13 years ago
- b371652 Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1 by Scott Main · 13 years ago
- e1419af am 26703326: docs: Google+ badge now sizes properly; remove reposition hack by Scott Main · 13 years ago
- 282ce65 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
- fd8d6c3 am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 by Robert Greenwalt · 13 years ago