- 2199d4d Merge "Add hooks to implement Canvas.drawTextOnPath() in GL" by Romain Guy · 13 years ago
- 7e2e6db Merge "Make compute work without an app context." by Jason Sams · 13 years ago
- bd7fc41 Merge "Fix NPE on Activity start in TextView" by Gilles Debunne · 13 years ago
- 32e887d Merge "Do RS caching the same way HardwareRenderer does. Eliminates the need for an application context for caching." by Jason Sams · 13 years ago
- b0f3186 Merge "test runs but I do not check results yet." by Jason Sams · 13 years ago
- 541b3cc Merge "Fix crash on long press in TextView" by Gilles Debunne · 13 years ago
- 9e6d9c6 Merge "Add support for optional titles in action modes" by Adam Powell · 13 years ago
- 561d42d Merge "remove libui dependency on libEGL" by Mathias Agopian · 13 years ago
- 870b8aa remove libui dependency on libEGL by Mathias Agopian · 13 years ago
- 657ab8a am 44b1a43d: am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 by Dianne Hackborn · 13 years ago
- e475b2c Merge "resolved conflicts for merge of 34706a4c to master" by Dianne Hackborn · 13 years ago
- 1897527 resolved conflicts for merge of 34706a4c to master by Dianne Hackborn · 13 years ago
- 0ffc8c6 Merge "Improved comment about DrmStore.ConstraintsColumns" by James Dong · 13 years ago
- ec9ac74 Merge "Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent" by James Dong · 13 years ago
- bf9473b am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 by Dianne Hackborn · 13 years ago
- de3f69a am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1 by Dianne Hackborn · 13 years ago
- 2f171c6 am 5786f5cf: Merge "Fix build." into ics-mr1 by Dianne Hackborn · 13 years ago
- 126004d am 5786f5cf: Merge "Fix build." into ics-mr1 by Dianne Hackborn · 13 years ago
- 49b0cca Merge "Fix build." into ics-mr1 by Dianne Hackborn · 13 years ago
- d020d61 am 92ce6314: am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 by Dianne Hackborn · 13 years ago
- f7a84a8 am 911b505f: am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 by Dianne Hackborn · 13 years ago
- 5d5f805 am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 by Dianne Hackborn · 13 years ago
- 2885748 am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 by Dianne Hackborn · 13 years ago
- 7a519df am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 by Dianne Hackborn · 13 years ago
- 651a8f4 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 by Dianne Hackborn · 13 years ago
- a270567 Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 by Dianne Hackborn · 13 years ago
- 1c071f8 Merge "deprecate L_8, LA_88 and RGB_332 in sdk" by Mathias Agopian · 13 years ago
- a60852f Merge "Seperate RIL constants from the framework." by Robert Greenwalt · 13 years ago
- ff615cc deprecate L_8, LA_88 and RGB_332 in sdk by Mathias Agopian · 13 years ago
- db58102 Merge "Pull CPU statistics code out of threadLoop()" by Glenn Kasten · 13 years ago
- 619fc0e am 5cb79935: am 2ddd7b3e: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- b5110d4 am 2ddd7b3e: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- 8210d88 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- a3f6627 am cb20fab2: am aac21480: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- f194523 Merge "Make sure we return input/output buffers to the codec not just while" by Andreas Huber · 13 years ago
- aaa2843 Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm" by Andreas Huber · 13 years ago
- c7b46b6 am aac21480: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- bb4bcfc Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
- 29348a8 Merge "Remove TrackBase::mFlags" by Glenn Kasten · 13 years ago
- 88ecefa Merge "Regression: Cannot query the content of certain windows." by Svetoslav Ganov · 13 years ago
- d8a1448 am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
- b3a5ddc am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 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
- a7e4b1a Merge "New notification priority and related APIs." by Daniel Sandler · 13 years ago
- a7e2d3c Merge "UiTestAutomationBridge does not terminate its HandlerThread." by Svetoslav Ganov · 13 years ago
- 93bd8c1 am 70450553: am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- e218874 am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
- 5a5fafc am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- 57408cc am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 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
- f41564a Merge "AccessibilityNodeInfos node properly cached." by Svetoslav Ganov · 13 years ago
- a7a6190 Merge "Fix HitTest type detection" by John Reck · 13 years ago
- 3815cf3 Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- 37f1a39 Merge "Small fix to MediaCodec" by Andreas Huber · 13 years ago
- 3f10c25 Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
- 4cb6eca am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
- 754e9d9 am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" 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
- 64c6b9d am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
- afe1786 am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 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
- 999a700 am 307f47aa: am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
- ea00944 am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 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
- b76e45b am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
- aad718b am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" 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
- d48dfda am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
- a29ae9e am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" 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
- 4bc887d Merge "Disable selection when nothing selected." by George Mount · 13 years ago
- 6fc2885 Merge "Fix blip after notifications are swiped" by Michael Jurka · 13 years ago
- 0c76ba2 Merge changes I97807db6,I7d350bc0 by Mathias Agopian · 13 years ago
- fbc7922 workaround for an issue where the screen would flicker sometimes by Mathias Agopian · 13 years ago
- 4d143ee fix an issue in SF where we could miss some updates by Mathias Agopian · 13 years ago
- 74ace17 Merge "Changed TimedTextInBandSource to TimedText3GPPSource." by James Dong · 13 years ago
- bf0dc63 Merge "Support email and phone types" by John Reck · 13 years ago
- 5f07ad3 Merge "Fixing issues with the AccessibilityNodeInfo cache." by Svetoslav Ganov · 13 years ago
- a914061 am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. by Xavier Ducrohet · 13 years ago
- 56498ad am 737d6ef5: (-s ours) am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. by inazaruk · 13 years ago
- 585a03b am 206be012: (-s ours) am ec63cd85: Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop by Andrew Flynn · 13 years ago
- 1db92ad am e2b98cf3: am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 by Joe Fernandez · 13 years ago
- 7434d28 am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. by Xavier Ducrohet · 13 years ago
- 5c8dd44 am 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. by inazaruk · 13 years ago
- 7a57989 am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. by Xavier Ducrohet · 13 years ago