summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e63f850b: am da0dc0af: Add liblogYing Wang2013-04-0948-38/+61
|\
| * am da0dc0af: Add liblogYing Wang2013-04-0948-38/+61
| |\
| | * Add liblogYing Wang2013-04-0948-38/+61
* | | am b021358d: am ec771223: Add support for common encryptionMarco Nelissen2013-04-087-8/+411
|\ \ \ | |/ /
| * | am ec771223: Add support for common encryptionMarco Nelissen2013-04-087-8/+411
| |\ \ | | |/
| | * Add support for common encryptionMarco Nelissen2013-04-087-8/+411
* | | am 61ab904a: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
|\ \ \ | |/ /
| * | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
| |\ \
| | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-040-0/+0
| | | |\
* | | | \ am 05cf8c99: am b3a95a56: Camera: implement takePicture for HAL3-using clientsIgor Murashkin2013-04-054-21/+414
|\ \ \ \ \ | |/ / / /
| * | | | am b3a95a56: Camera: implement takePicture for HAL3-using clientsIgor Murashkin2013-04-054-21/+414
| |\ \ \ \ | | |/ / /
| | * | | Camera: implement takePicture for HAL3-using clientsIgor Murashkin2013-04-054-21/+414
* | | | | am 57a1f3e9: am 526b2285: Merge "In certain cases where AAC audio frames exte...Andreas Huber2013-04-051-24/+37
|\ \ \ \ \ | |/ / / /
| * | | | am 526b2285: Merge "In certain cases where AAC audio frames extended into the...Andreas Huber2013-04-051-24/+37
| |\ \ \ \ | | |/ / /
| | * | | Merge "In certain cases where AAC audio frames extended into the next PES pay...Andreas Huber2013-04-051-24/+37
| | |\ \ \
| | | * | | In certain cases where AAC audio frames extended into the next PES payloadAndreas Huber2013-04-051-24/+37
* | | | | | am c2ccb7d9: am d5ef30b2: Merge "Implement async event callout from drm plugi...Jeff Tinker2013-04-048-4/+228
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d5ef30b2: Merge "Implement async event callout from drm plugin to Java app...Jeff Tinker2013-04-048-4/+228
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Implement async event callout from drm plugin to Java app" into jb-mr2...Jeff Tinker2013-04-058-4/+228
| | |\ \ \ \
| | | * | | | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-038-4/+228
* | | | | | | am 1da297f9: am f8fae863: Merge "Make sure resume() and flush() are handled a...Marco Nelissen2013-04-041-0/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f8fae863: Merge "Make sure resume() and flush() are handled appropriately ...Marco Nelissen2013-04-041-0/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Make sure resume() and flush() are handled appropriately even if the c...Marco Nelissen2013-04-041-0/+15
| | |\ \ \ \ \
| | | * | | | | Make sure resume() and flush() are handled appropriately even if the codecMarco Nelissen2013-04-041-0/+15
* | | | | | | | am 5cb91a72: am af69ca18: Merge "audioflinger: multiple tracks on direct outp...Eric Laurent2013-04-041-45/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am af69ca18: Merge "audioflinger: multiple tracks on direct output" into jb-m...Eric Laurent2013-04-041-45/+52
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "audioflinger: multiple tracks on direct output" into jb-mr2-devEric Laurent2013-04-041-45/+52
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | audioflinger: multiple tracks on direct outputEric Laurent2013-04-041-45/+52
| | | | |_|/ / | | | |/| | |
* | | | | | | am 13837944: am 2e9c6f37: Merge "Fix previous changes." into jb-mr2-devLajos Molnar2013-04-043-8/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2e9c6f37: Merge "Fix previous changes." into jb-mr2-devLajos Molnar2013-04-043-8/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix previous changes." into jb-mr2-devLajos Molnar2013-04-043-8/+13
| | |\ \ \ \ \
| | | * | | | | Fix previous changes.Andreas Huber2013-04-043-8/+13
* | | | | | | | am 3141de27: am 74a6b0f1: Merge "RTPReceiver can now track packet loss, accou...Andreas Huber2013-04-042-65/+215
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 74a6b0f1: Merge "RTPReceiver can now track packet loss, account for late a...Andreas Huber2013-04-042-65/+215
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "RTPReceiver can now track packet loss, account for late arrivals" into...Andreas Huber2013-04-042-65/+215
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | RTPReceiver can now track packet loss, account for late arrivalsAndreas Huber2013-04-042-65/+215
* | | | | | | | am 2814a493: am 071c6334: Merge "Support "raw" packetization in RTPSender." i...Andreas Huber2013-04-044-1/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 071c6334: Merge "Support "raw" packetization in RTPSender." into jb-mr2-devAndreas Huber2013-04-044-1/+46
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Support "raw" packetization in RTPSender." into jb-mr2-devAndreas Huber2013-04-044-1/+46
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Support "raw" packetization in RTPSender.Andreas Huber2013-04-044-1/+46
* | | | | | | | am 2db8a06a: am 8f2f7b33: Merge "New nettest, a simple TCP connection test to...Andreas Huber2013-04-042-0/+418
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8f2f7b33: Merge "New nettest, a simple TCP connection test to measure" int...Andreas Huber2013-04-042-0/+418
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-devAndreas Huber2013-04-042-0/+418
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | New nettest, a simple TCP connection test to measureAndreas Huber2013-04-042-0/+418
* | | | | | | | am 0dfa63f8: am 13e1c06b: Merge "RTPTest updated to allow for UDP/TCP transpo...Andreas Huber2013-04-041-49/+228
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 13e1c06b: Merge "RTPTest updated to allow for UDP/TCP transport and abstra...Andreas Huber2013-04-041-49/+228
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "RTPTest updated to allow for UDP/TCP transport and abstracted" into jb...Andreas Huber2013-04-041-49/+228
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | RTPTest updated to allow for UDP/TCP transport and abstractedAndreas Huber2013-04-041-49/+228
* | | | | | | | am da88aa77: am ac67e976: Merge "Track max latency in WifiDisplaySink" into j...Andreas Huber2013-04-042-5/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /