summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | am ceec31b7: Merge changes I5a218ca1,I853a76d9Mathias Agopian2013-02-156-12/+11
|\ \ \ \ \ | |/ / / /
| * | | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-156-12/+11
* | | | | am bfcae359: Surface doens\'t have an identity anymoreMathias Agopian2013-02-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Surface doens't have an identity anymoreMathias Agopian2013-02-141-1/+1
* | | | | resolved conflicts for merge of 58a1ca66 to master-chromiumKristian Monsen2013-02-142-59/+8
|\ \ \ \ \ | |/ / / /
| * | | | split Surface in two classes: SurfaceControl and SurfaceMathias Agopian2013-02-142-59/+8
| * | | | Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik2013-02-131-1/+0
|/ / / /
* | | | am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local f...Marco Nelissen2013-02-121-5/+48
|\ \ \ \ | |/ / /
| * | | Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""Marco Nelissen2013-02-121-5/+48
| |\ \ \
| | * | | Revert "use utf8_length() instead of local function, isValidUtf8()"Marco Nelissen2013-02-121-5/+48
* | | | | Add support for querying whether the music stream is active remotelyJean-Michel Trivi2013-02-112-0/+18
* | | | | am 78c2d8b3: Merge "AudioRecord: allow front + back mic capture"Eric Laurent2013-01-311-0/+5
|\ \ \ \ \
| * \ \ \ \ Merge "AudioRecord: allow front + back mic capture"Eric Laurent2013-01-311-0/+5
| |\ \ \ \ \
| | * | | | | AudioRecord: allow front + back mic captureEric Laurent2013-01-171-0/+5
* | | | | | | am 6d2def71: am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integ...Amith Yamasani2013-01-281-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow i...Amith Yamasani2013-01-281-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"Amith Yamasani2013-01-281-1/+1
| | |\ \ \ \ \
| | | * \ \ \ \ am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"Amith Yamasani2013-01-281-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix possible integer overflow in MtpStorageHenrik Engström2013-01-091-1/+1
* | | | | | | | | am a7110fd1: Merge "Fix build."Dianne Hackborn2013-01-161-9/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix build.Dianne Hackborn2013-01-161-9/+16
* | | | | | | | | am 35654b61: More work on App Ops service.Dianne Hackborn2013-01-164-50/+69
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | More work on App Ops service.Dianne Hackborn2013-01-164-50/+69
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | am 26bf4d90: Merge "Optimize media button stack traversal for remote volume"Jean-Michel Trivi2013-01-111-31/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Optimize media button stack traversal for remote volume"Jean-Michel Trivi2013-01-111-31/+37
| |\ \ \ \ \ \ \
| | * | | | | | | Optimize media button stack traversal for remote volumeJean-Michel Trivi2013-01-071-31/+37
* | | | | | | | | am 9003007d: Merge "Fix Volume icons for RTL languages"Fabrice Di Meglio2013-01-111-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix Volume icons for RTL languages"Fabrice Di Meglio2013-01-111-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix Volume icons for RTL languagesFabrice Di Meglio2013-01-091-0/+1
| | |/ / / / / / /
* | | | | | | | | am ceea8857: am 68ba8b91: am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32:...Jason Noguchi2013-01-092-175/+224
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 68ba8b91: am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refac...Jason Noguchi2013-01-092-175/+224
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the me...Jason Noguchi2013-01-072-175/+224
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test ca...Jason Noguchi2013-01-072-175/+224
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge "Refactoring the media recorder stress test. Added test cases for: - re...Jason Noguchi2013-01-072-175/+224
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Refactoring the media recorder stress test.Jason Noguchi2013-01-032-175/+224
* | | | | | | | | | | am 9964fd37: am 8d73c043: am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f:...Jason Noguchi2013-01-091-54/+135
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 8d73c043: am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Addin...Jason Noguchi2013-01-091-54/+135
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scen...Jason Noguchi2013-01-071-54/+135
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-devJason Noguchi2013-01-071-54/+135
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Adding camera scene mode stress test.Jason Noguchi2013-01-021-54/+135
| | | | |/ / / / /
* | | | | | | | | am b102fb8e: Merge "Fix media scan NPE"Marco Nelissen2013-01-091-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix media scan NPEMarco Nelissen2013-01-091-1/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | am e0c93e08: Merge "Use playback state to update remote control stack"Jean-Michel Trivi2013-01-031-0/+56
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Use playback state to update remote control stackJean-Michel Trivi2013-01-021-0/+56
* | | | | | | | am 84aa61e2: Optimize remote control stack traversal orderJean-Michel Trivi2013-01-021-64/+75
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Optimize remote control stack traversal orderJean-Michel Trivi2013-01-021-64/+75
* | | | | | | | am 383f36cf: Merge "Add comments on remote control stack traversal order"Jean-Michel Trivi2013-01-021-3/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add comments on remote control stack traversal order"Jean-Michel Trivi2013-01-021-3/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Add comments on remote control stack traversal orderJean-Michel Trivi2013-01-021-3/+22
* | | | | | | | | am d6a7925d: Merge "Updates to remote control client (un)registration"Jean-Michel Trivi2013-01-021-53/+69
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /