Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
|\ | |||||
| * | am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| |\ | |||||
| | * | Verify certificates | Marco Nelissen | 2014-03-19 | 1 | -2/+102 |
* | | | am 7d72965f: am 60476336: Remove obsolete drm manager code | Jeff Tinker | 2013-08-19 | 8 | -73/+0 |
|\ \ \ | |/ / | |||||
| * | | am 60476336: Remove obsolete drm manager code | Jeff Tinker | 2013-08-19 | 8 | -73/+0 |
| |\ \ | | |/ | |||||
| | * | Remove obsolete drm manager code | Jeff Tinker | 2013-08-16 | 8 | -73/+0 |
* | | | Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-11-01 | 0 | -0/+0 |
| |\ \ \ |/ / / / | |||||
| * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-31 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-29 | 0 | -0/+0 |
| | |\ \ \ | |||||
| | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-26 | 0 | -0/+0 |
| | | |\ \ \ | |||||
| | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-25 | 0 | -0/+0 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-23 | 0 | -0/+0 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-23 | 0 | -0/+0 |
| | | | | | |\ \ \ | |||||
| | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-22 | 0 | -0/+0 |
| | | | | | | |\ \ \ | |||||
| | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-20 | 0 | -0/+0 |
| | | | | | | | |\ \ \ | |||||
| | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-19 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-18 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-17 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-16 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-12 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | |/| | | | |||||
| | | | | | | | | | | | | | | | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-07 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-07 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | * | | | | Camera2: Don't promote weak IBinder ptrs to strong ones | Igor Murashkin | 2012-10-05 | 2 | -12/+14 |
| | | | | | | | | | | | | | | | | | | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | * | | | | Camera2: Fix deadlock while zooming during record | Igor Murashkin | 2012-10-04 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | | | | Camera2: Properly update FPS range when FPS is set. | Eino-Ville Talvala | 2012-10-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | * | | | | Drop video bitrate to 2.5mbps. | Dave Burke | 2012-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | * | | | | Better power savings with wifi display code. | Andreas Huber | 2012-10-03 | 4 | -22/+104 |
| | | | | | | | | | | | | | | | | | | | | | * | | | | Increase polling frequency again temporarily to fix A/V issues | Andreas Huber | 2012-10-03 | 2 | -14/+24 |
| | | | | | | | | | | | | | | | | | | | | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-02 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | Perform an orderly shutdown if possible, force disconnect if necessary | Andreas Huber | 2012-10-01 | 3 | -7/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | Remove double negatives from SurfaceMediaSource | Andreas Huber | 2012-10-01 | 2 | -9/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | Make sure we still handle shutdown-related message even if we're | Andreas Huber | 2012-10-01 | 1 | -20/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-28 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-26 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-23 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |