summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge changes I97807db6,I7d350bc0Mathias Agopian2012-02-233-31/+34
|\
| * workaround for an issue where the screen would flicker sometimesMathias Agopian2012-02-231-0/+6
| * fix an issue in SF where we could miss some updatesMathias Agopian2012-02-233-31/+28
* | Merge "Changed TimedTextInBandSource to TimedText3GPPSource."James Dong2012-02-234-48/+51
|\ \
| * | Changed TimedTextInBandSource to TimedText3GPPSource.Insun Kang2012-02-234-48/+51
* | | Merge "Support email and phone types"John Reck2012-02-231-24/+33
|\ \ \
| * | | Support email and phone typesJohn Reck2012-02-231-24/+33
* | | | Merge "Fixing issues with the AccessibilityNodeInfo cache."Svetoslav Ganov2012-02-239-176/+310
|\ \ \ \
| * | | | Fixing issues with the AccessibilityNodeInfo cache.Svetoslav Ganov2012-02-239-176/+310
* | | | | am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace...Xavier Ducrohet2012-02-230-0/+0
|\ \ \ \ \
| * \ \ \ \ am f31297ed: am 816b873d: Move the automatic namespace outside of the res nam...Xavier Ducrohet2012-02-230-0/+0
| |\ \ \ \ \
| | * \ \ \ \ am 816b873d: Move the automatic namespace outside of the res namespace. do no...Xavier Ducrohet2012-02-231-1/+1
| | |\ \ \ \ \
* | | \ \ \ \ \ am 737d6ef5: (-s ours) am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom ...inazaruk2012-02-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Andro...inazaruk2012-02-230-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries....inazaruk2012-02-231-3/+9
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ am 206be012: (-s ours) am ec63cd85: Merge "DO NOT MERGE Return 1.5 * density ...Andrew Flynn2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am ec63cd85: Merge "DO NOT MERGE Return 1.5 * density as default for large sc...Andrew Flynn2012-02-231-6/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ...Andrew Flynn2012-02-231-6/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | DO NOT MERGE Return 1.5 * density as default for large screens.Andrew Flynn2012-02-231-6/+12
* | | | | | | | | | am e2b98cf3: am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 ...Joe Fernandez2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction s...Joe Fernandez2012-02-230-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b...Joe Fernandez2012-02-231-1/+1
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace...Xavier Ducrohet2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b3c780f1: am 816b873d: Move the automatic namespace outside of the res nam...Xavier Ducrohet2012-02-231-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 816b873d: Move the automatic namespace outside of the res namespace. do no...Xavier Ducrohet2012-02-231-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Move the automatic namespace outside of the res namespace. do not merge.Xavier Ducrohet2012-02-231-1/+1
| | | | |_|_|/ / / / / | | | |/| | | | | | |
* | | | | | | | | | | am 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix for issue 9656 - custom ...inazaruk2012-02-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Andro...inazaruk2012-02-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries....inazaruk2012-02-230-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.inazaruk2012-02-231-3/+9
| | | | |/ / / / / / | | | |/| | | | | |
* | | | | | | | | | Merge "More RS cpp binding work. All classes for compute should be partially...Jason Sams2012-02-2313-33/+259
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | More RS cpp binding work. All classes forJason Sams2012-02-2313-33/+259
* | | | | | | | | | | Merge "Move the automatic namespace outside of the res namespace."Xavier Ducrohet2012-02-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move the automatic namespace outside of the res namespace.Xavier Ducrohet2012-02-231-1/+1
* | | | | | | | | | | | Merge "Only recreate path textures when necessary"Romain Guy2012-02-233-13/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Only recreate path textures when necessaryRomain Guy2012-02-233-13/+24
* | | | | | | | | | | | | Merge "Adding a few more howto elements to scenegraph example."Alex Sakhartchouk2012-02-232-10/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Adding a few more howto elements to scenegraph example.Alex Sakhartchouk2012-02-232-10/+86
* | | | | | | | | | | | | Merge "Add javascript key events for special characters."George Mount2012-02-232-14/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add javascript key events for special characters.George Mount2012-02-232-14/+28
* | | | | | | | | | | | | | am fad35e3b: am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 ...Joe Fernandez2012-02-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | / / / / / / / / / | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction s...Joe Fernandez2012-02-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b...Joe Fernandez2012-02-231-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" in...Joe Fernandez2012-02-231-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | docs: NDK overview, remove x86 instruction set mention (b/6044027)Joe Fernandez2012-02-221-1/+1
* | | | | | | | | | | | | | Merge "start new headers"Jason Sams2012-02-2314-1/+1980
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | start new headersJason Sams2012-02-2214-1/+1980
* | | | | | | | | | | | | | | Merge "Fix memory leakage due to unreleased MuxOMX objects after disconnection"James Dong2012-02-231-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix memory leakage due to unreleased MuxOMX objects after disconnectionJames Dong2012-02-231-0/+4
* | | | | | | | | | | | | | | | Merge "Perform early intersect to avoid unnecessary draws"Romain Guy2012-02-233-48/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |