summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 7d2e3939: am c1d47c50: Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
|\
| * am c1d47c50: Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
| |\
| | * Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
| | |\
| | | * Monitor device rotationJean-Michel Trivi2013-05-281-6/+50
* | | | am b809577f: am b318f7b9: Merge "Refactor of camera stress test to add camera...Jason Noguchi2013-05-306-197/+995
|\ \ \ \ | |/ / /
| * | | am b318f7b9: Merge "Refactor of camera stress test to add camera test helper....Jason Noguchi2013-05-296-197/+995
| |\ \ \ | | |/ /
| | * | Merge "Refactor of camera stress test to add camera test helper. Also add add...Jason Noguchi2013-05-306-197/+995
| | |\ \
| | | * | Refactor of camera stress test to add camera test helper. Also addJason Noguchi2013-05-286-197/+995
* | | | | am fabd32c1: am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC...Lajos Molnar2013-05-291-11/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into j...Lajos Molnar2013-05-291-11/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-devLajos Molnar2013-05-291-11/+4
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAGLajos Molnar2013-05-291-11/+4
* | | | | am 03367e29: am b830d527: Merge "Update test with CamercorderProfile video si...Yu Shan Emily Lau2013-05-241-16/+15
|\ \ \ \ \ | |/ / / /
| * | | | am b830d527: Merge "Update test with CamercorderProfile video size." into jb-...Yu Shan Emily Lau2013-05-241-16/+15
| |\ \ \ \ | | |/ / /
| | * | | Merge "Update test with CamercorderProfile video size." into jb-mr2-devYu Shan Emily Lau2013-05-251-16/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update test with CamercorderProfile video size.Yu Shan Emily Lau2013-05-231-16/+15
* | | | | am eaa9ce70: am 606ab470: Merge "Improve exception error messages to help dia...Jeff Tinker2013-05-221-32/+70
|\ \ \ \ \ | |/ / / /
| * | | | am 606ab470: Merge "Improve exception error messages to help diagnose app err...Jeff Tinker2013-05-221-32/+70
| |\ \ \ \ | | |/ / /
| | * | | Merge "Improve exception error messages to help diagnose app errors" into jb-...Jeff Tinker2013-05-221-32/+70
| | |\ \ \
| | | * | | Improve exception error messages to help diagnose app errorsJeff Tinker2013-05-211-32/+70
* | | | | | am 09d6ad37: am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm....Jeff Tinker2013-05-221-5/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest...Jeff Tinker2013-05-221-5/+29
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix invalid keyType translation in MediaDrm.getKeyRequestJeff Tinker2013-05-211-5/+29
| | |/ / /
* | | | | am b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-devJeff Brown2013-05-171-7/+55
|\ \ \ \ \ | |/ / / /
| * | | | am 50ab525a: Merge "Add route description API." into jb-mr2-devJeff Brown2013-05-171-7/+55
| |\ \ \ \ | | |/ / /
| | * | | Add route description API.Jeff Brown2013-05-161-7/+55
| | |/ /
* | | | am f8e54846: am 9766caed: Merge "Add an API to determine if a route is connec...Jeff Brown2013-05-101-1/+13
|\ \ \ \ | |/ / /
| * | | am 9766caed: Merge "Add an API to determine if a route is connecting." into j...Jeff Brown2013-05-101-1/+13
| |\ \ \ | | |/ /
| | * | Merge "Add an API to determine if a route is connecting." into jb-mr2-devJeff Brown2013-05-101-1/+13
| | |\ \
| | | * | Add an API to determine if a route is connecting.Jeff Brown2013-05-091-1/+13
* | | | | am 68c666eb: am 804e618d: Fix buildMarco Nelissen2013-05-101-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 804e618d: Fix buildMarco Nelissen2013-05-101-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Fix buildMarco Nelissen2013-05-101-0/+5
* | | | | am 214c7474: am aad3762f: Merge "Fix build" into jb-mr2-devMarco Nelissen2013-05-101-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | am aad3762f: Merge "Fix build" into jb-mr2-devMarco Nelissen2013-05-101-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix build" into jb-mr2-devMarco Nelissen2013-05-101-0/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix buildMarco Nelissen2013-05-101-0/+5
* | | | | am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request ac...Jeff Brown2013-05-091-28/+143
|\ \ \ \ \ | |/ / / /
| * | | | am b2f6842d: Merge "Add an API to allow a callback to request active scans." ...Jeff Brown2013-05-091-28/+143
| |\ \ \ \ | | |/ / /
| | * | | Add an API to allow a callback to request active scans.Jeff Brown2013-05-091-28/+143
* | | | | am 507a3c77: am 2298d68e: Merge "Fix bug managing wifi display routes." into ...Jeff Brown2013-05-091-13/+9
|\ \ \ \ \ | |/ / / /
| * | | | am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-devJeff Brown2013-05-091-13/+9
| |\ \ \ \ | | |/ / /
| | * | | Fix bug managing wifi display routes.Jeff Brown2013-05-091-13/+9
| | |/ /
* | | | am 5adeaeab: am 02f7f449: Merge "Correct java API docs for MediaDrm offline u...Jeff Tinker2013-05-081-5/+10
|\ \ \ \ | |/ / /
| * | | am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into...Jeff Tinker2013-05-071-5/+10
| |\ \ \ | | |/ /
| | * | Correct java API docs for MediaDrm offline use caseJeff Tinker2013-05-071-5/+10
| | |/
* | | Merge "Fix BT SCO audio test application."Eric Laurent2013-05-081-6/+11
|\ \ \
| * | | Fix BT SCO audio test application.Eric Laurent2013-05-011-6/+11
* | | | Add new app ops for various interesting audio service things.Dianne Hackborn2013-05-064-44/+101
* | | | am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle e...Jeff Tinker2013-05-016-17/+120
|\ \ \ \ | | |/ / | |/| |