summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* libagl shouldn't export anythingMathias Agopian2012-02-272-658/+640
* remove dummy libsurfaceflinger_clientMathias Agopian2012-02-271-10/+0
* Merge "affect -> effect and incorrect possessive"Vikram Aggarwal2012-02-270-0/+0
|\
* \ Merge "gltrace: Make code 64-bit safe."Siva Velusamy2012-02-274-555/+2118
|\ \
| * | gltrace: Make code 64-bit safe.Siva Velusamy2012-02-274-555/+2118
* | | am 718af2f9: am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics...Robert Ly2012-02-270-0/+0
|\ \ \ | |_|/ |/| |
| * | am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1Robert Ly2012-02-270-0/+0
| |\ \
| | * \ am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1Robert Ly2012-02-270-0/+0
| | |\ \
* | | \ \ am 9dc8ea87: am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics...Robert Ly2012-02-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1Robert Ly2012-02-270-0/+0
| |\ \ \ \
| | * \ \ \ am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1Robert Ly2012-02-270-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "docs: fix bug 5990526" into ics-mr1Robert Ly2012-02-270-0/+0
| | | |\ \ \
* | | | \ \ \ am 7a879da1: am df154866: am 44e63a21: Support rendering layout that use the ...Xavier Ducrohet2012-02-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am df154866: am 44e63a21: Support rendering layout that use the new res-auto ...Xavier Ducrohet2012-02-240-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am 44e63a21: Support rendering layout that use the new res-auto namespace.Xavier Ducrohet2012-02-240-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
* | | | | | | am 77fdcbff: am f038868d: am 44e63a21: Support rendering layout that use the ...Xavier Ducrohet2012-02-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f038868d: am 44e63a21: Support rendering layout that use the new res-auto ...Xavier Ducrohet2012-02-240-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 44e63a21: Support rendering layout that use the new res-auto namespace.Xavier Ducrohet2012-02-240-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
* | | | | | | Merge "gltrace: attach buffer data sent with glBufferData"Siva Velusamy2012-02-271-0/+28
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | gltrace: attach buffer data sent with glBufferDataSiva Velusamy2012-02-241-0/+28
* | | | | | | Merge "Make threadLoop() logs identical"Glenn Kasten2012-02-270-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Move declaration of mixerStatus to inner block"Glenn Kasten2012-02-270-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Fix looping HTML5 Audio."Ben Murdoch2012-02-270-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Removed dependecies between BufferQueue and SurfaceTexture"Jamie Gennis2012-02-264-168/+438
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed dependecies between BufferQueue and SurfaceTextureDaniel Lam2012-02-224-168/+438
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-02-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "attempt to fix IMSFramework crash"Mathias Agopian2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching"Adam Powell2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix fullScreenIntents."Daniel Sandler2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "remove dependency on android_native{s_priv|buffer}.h"Mathias Agopian2012-02-2413-144/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remove dependency on android_native{s_priv|buffer}.hMathias Agopian2012-02-2413-144/+21
* | | | | | | | | | | | | | | Merge "New development permissions."Dianne Hackborn2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "More infrastructure for Canvas.drawTextOnPath"Romain Guy2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add hooks to implement Canvas.drawTextOnPath() in GL"Romain Guy2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Make compute work without an app context."Jason Sams2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix NPE on Activity start in TextView"Gilles Debunne2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Do RS caching the same way HardwareRenderer does. Eliminates the need ...Jason Sams2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "test runs but I do not check results yet."Jason Sams2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Fix crash on long press in TextView"Gilles Debunne2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Add support for optional titles in action modes"Adam Powell2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "remove libui dependency on libEGL"Mathias Agopian2012-02-2441-138/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | / / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | remove libui dependency on libEGLMathias Agopian2012-02-2441-138/+103
* | | | | | | | | | | | | | | | | | am 44b1a43d: am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 34706a4c to master"Dianne Hackborn2012-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 34706a4c to masterDianne Hackborn2012-02-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-240-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \