summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Support AMR, G.711 and vorbis audio in ACodec and friends.Andreas Huber2011-09-284-8/+147
* Merge "Added landscape views for Face Unlock"Brian Colonna2011-09-282-0/+27
|\
| * Added landscape views for Face UnlockBrian Colonna2011-09-272-0/+27
* | Merge "Fix 5323545 - FaceLock no longer appears when taking a call"Brian Colonna2011-09-285-50/+31
|\ \ | |/
| * Fix 5323545 - FaceLock no longer appears when taking a callBrian Colonna2011-09-275-50/+31
* | Merge "Fix 5158468: Update floating window size when the anchor view size cha...Chih-Chung Chang2011-09-282-26/+52
|\ \
| * | Fix 5158468: Update floating window size when the anchor view size changes.Chih-Chung Chang2011-09-282-26/+52
* | | Merge "Do not format numbers starting with hash or star."Flavio Lerda2011-09-282-0/+17
|\ \ \
| * | | Do not format numbers starting with hash or star.Flavio Lerda2011-09-272-0/+17
* | | | Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack"Steve Block2011-09-282-2/+12
|\ \ \ \
| * | | | Hook up WebView.clearSslPreferences() for the Chromium HTTP stackKristian Monsen2011-09-282-2/+12
* | | | | Merge "Document thrown IllegalArgumentException."Mathew Inwood2011-09-281-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Document thrown IllegalArgumentException.Mathew Inwood2011-09-261-0/+1
* | | | | Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs"Fabrice Di Meglio2011-09-271-15/+4
|\ \ \ \ \
| * | | | | Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphsFabrice Di Meglio2011-09-261-15/+4
* | | | | | Merge "Use CPU upload path in DRT"Guang Zhu2011-09-271-0/+3
|\ \ \ \ \ \
| * | | | | | Use CPU upload path in DRTGuang Zhu2011-09-271-0/+3
* | | | | | | Merge "Add a bit more doc to TextureView"Romain Guy2011-09-271-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Add a bit more doc to TextureViewRomain Guy2011-09-271-0/+9
* | | | | | | | am 0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge.Romain Guy2011-09-270-0/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | CherryPick 043a6b from master: do not merge.Romain Guy2011-09-271-3/+12
* | | | | | | | Merge "Test to demonstrate NPE in DefaultRequestDirector"Jesse Wilson2011-09-271-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Test to demonstrate NPE in DefaultRequestDirectorJesse Wilson2011-09-271-0/+17
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #...Xavier Ducrohet2011-09-271-3/+12
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Don't use OpenGL ES 2.0 to render the wallpaper on the emulator.Romain Guy2011-09-271-3/+12
* | | | | | | | Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."Andreas Huber2011-09-272-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Cut down on AwesomePlayer and OMXCodec's verbosity.Andreas Huber2011-09-272-9/+9
* | | | | | | | | Merge "Lockscreen handle is now a locked icon and not an unlocked"Peter Ng2011-09-276-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Lockscreen handle is now a locked icon and not an unlockedPeter Ng2011-09-276-0/+0
* | | | | | | | | | am ce9756d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-273-11/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-09-273-11/+11
* | | | | | | | | | | Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various ...Scott Main2011-09-274-19/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs: mix of BT and NFC javadoc updatesScott Main2011-09-274-19/+33
* | | | | | | | | | | | Merge changes Ib302d79e,Ib4ee085fJamie Gennis2011-09-275-62/+102
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SurfaceFlinger: set layer names on SurfaceTexturesJamie Gennis2011-09-223-1/+7
| * | | | | | | | | | | | SurfaceTexture: add name supportJamie Gennis2011-09-222-61/+95
* | | | | | | | | | | | | Merge "Fix issue 5373658: memory leak in AudioFlinger."Eric Laurent2011-09-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix issue 5373658: memory leak in AudioFlinger.Eric Laurent2011-09-271-0/+4
* | | | | | | | | | | | | Merge "Signal an appropriate error even if there are no active streams yet."Andreas Huber2011-09-276-27/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Signal an appropriate error even if there are no active streams yet.Andreas Huber2011-09-276-27/+32
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Add Detailed Sync Stats Section Also improve history formatting Here's...Alon Albert2011-09-271-62/+232
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add Detailed Sync Stats SectionAlon Albert2011-09-271-62/+232
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | am 25bb73eb: Merge "Remove "excessive sync" icon." into ics-factoryromDaniel Sandler2011-09-271-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | / / / / | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge "Remove "excessive sync" icon." into ics-factoryromDaniel Sandler2011-09-271-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove "excessive sync" icon.Daniel Sandler2011-09-261-0/+3
* | | | | | | | | | | | | am 45c65741: am be49703e: am d51ecafa: opengl: Ensure we only load the GLES e...David 'Digit' Turner2011-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am be49703e: am d51ecafa: opengl: Ensure we only load the GLES emulation libr...David 'Digit' Turner2011-09-231-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am d51ecafa: opengl: Ensure we only load the GLES emulation library when the ...David 'Digit' Turner2011-09-231-0/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | opengl: Ensure we only load the GLES emulation library when the emulator supp...David 'Digit' Turner2011-09-161-0/+43