Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries" | Edwin Wong | 2012-08-03 | 2 | -34/+1 | |
* | Revert Widevine 6.0.0 -> 4.5.0 libraries | Edwin Wong | 2012-08-03 | 2 | -1/+34 | |
* | Merge "Remove libdrmdecrypt from AOSP build." | Fred | 2012-07-17 | 2 | -30/+0 | |
|\ | ||||||
| * | Remove libdrmdecrypt from AOSP build. | Fred | 2012-07-07 | 2 | -30/+0 | |
* | | Fixup ion change to old library | Rebecca Schultz Zavin | 2012-07-09 | 6 | -6/+131 | |
|/ | ||||||
* | am 692b0d66: Reconcile with jb-release | The Android Open Source Project | 2012-06-29 | 0 | -0/+0 | |
|\ | ||||||
| * | Reconcile with jb-release | The Android Open Source Project | 2012-06-29 | 0 | -0/+0 | |
| |\ | ||||||
| | * | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-06-26 | 0 | -0/+0 | |
| | |\ | ||||||
* | | \ | Merge "Put back old ion library" | Rebecca Schultz Zavin | 2012-06-28 | 9 | -6/+212 | |
|\ \ \ \ | ||||||
| * | | | | Put back old ion library | Rebecca Schultz Zavin | 2012-06-28 | 9 | -6/+212 | |
* | | | | | am 35e328cb: am 812f0cdd: fix full_maguro-userdebug build | Keun young Park | 2012-06-25 | 1 | -0/+2 | |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| * | | | am 812f0cdd: fix full_maguro-userdebug build | Keun young Park | 2012-06-25 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | fix full_maguro-userdebug build | Keun young Park | 2012-06-25 | 1 | -0/+2 | |
* | | | | am b9bf3ee0: Reconcile with jb-release | The Android Open Source Project | 2012-05-24 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Reconcile with jb-release | The Android Open Source Project | 2012-05-24 | 0 | -0/+0 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-24 | 0 | -0/+0 | |
| | |\ \ | | | |/ | | |/| | ||||||
| | | * | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-23 | 0 | -0/+0 | |
| | | |\ | ||||||
* | | | \ | am ca48276c: am c78626b1: CameraHal: Avoids possible race conditions while ac... | Emilian Peev | 2012-05-23 | 7 | -91/+84 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am c78626b1: CameraHal: Avoids possible race conditions while accessing \'mPa... | Emilian Peev | 2012-05-23 | 7 | -91/+84 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | CameraHal: Avoids possible race conditions while accessing 'mParams' | Emilian Peev | 2012-05-23 | 7 | -91/+84 | |
| | |/ / | ||||||
* | | | | am 94d807c4: am 8fa731dd: Don\'t include widevine proprietary for panda. | Jean-Baptiste Queru | 2012-05-22 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am 8fa731dd: Don\'t include widevine proprietary for panda. | Jean-Baptiste Queru | 2012-05-22 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Don't include widevine proprietary for panda. | Jean-Baptiste Queru | 2012-05-22 | 1 | -0/+2 | |
* | | | | am d6204cf0: Reconcile with jb-release | The Android Open Source Project | 2012-05-22 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Reconcile with jb-release | The Android Open Source Project | 2012-05-22 | 0 | -0/+0 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-22 | 0 | -0/+0 | |
| | |\ \ | | | |/ | | |/| | ||||||
* | | | | Revert "hwc: Stash hdmi mode resolution in a property" | Mike J. Chen | 2012-05-22 | 1 | -16/+1 | |
* | | | | am ce768b26: hwc: Stash hdmi mode resolution in a property | Mike J. Chen | 2012-05-21 | 1 | -1/+16 | |
|\ \ \ \ | ||||||
| * | | | | hwc: Stash hdmi mode resolution in a property | Mike J. Chen | 2012-05-21 | 1 | -1/+16 | |
* | | | | | am aca35afd: am 16b7f6c4: hwc: Fix truncation errors in scaling decision | Lajos Molnar | 2012-05-21 | 1 | -4/+8 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | am 16b7f6c4: hwc: Fix truncation errors in scaling decision | Lajos Molnar | 2012-05-21 | 1 | -4/+8 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | hwc: Fix truncation errors in scaling decision | Lajos Molnar | 2012-05-21 | 1 | -4/+8 | |
* | | | | | am 7a7d4c25: (-s ours) am 4495a871: Fix secondary builds (AOSP, panda) - do n... | Jean-Baptiste Queru | 2012-05-21 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am 4495a871: Fix secondary builds (AOSP, panda) - do not merge | Jean-Baptiste Queru | 2012-05-21 | 1 | -2/+4 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Fix secondary builds (AOSP, panda) - do not merge | Jean-Baptiste Queru | 2012-05-21 | 1 | -2/+4 | |
* | | | | | am 97160be1: (-s ours) DO NOT MERGE | Mike J. Chen | 2012-05-17 | 0 | -0/+0 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | DO NOT MERGE | Mike J. Chen | 2012-05-17 | 1 | -33/+134 | |
* | | | | | am c6c812ab: (-s ours) DO NOT MERGE: | Mike J. Chen | 2012-05-16 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | DO NOT MERGE: | Mike J. Chen | 2012-05-16 | 1 | -134/+33 | |
* | | | | | am fc8f4796: (-s ours) DO NOT MERGE | Dandawate Saket | 2012-05-16 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | DO NOT MERGE | Dandawate Saket | 2012-05-04 | 1 | -23/+28 | |
* | | | | | am fff80172: Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| | | | | | ||||||
| | \ \ \ | ||||||
| *-. \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
| |\ \ \ \ \ | | |/ / / _ | | | | / | | |_|/ | |/| | | ||||||
| | * | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-14 | 0 | -0/+0 | |
| | |\ \ | |/ / / | ||||||
| | * | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-10 | 0 | -0/+0 | |
| | |\ \ | ||||||
| | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-08 | 0 | -0/+0 | |
| | | |\ \ | ||||||
| | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-07 | 0 | -0/+0 | |
| | | | |\ \ | ||||||
| | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-02 | 0 | -0/+0 | |
| | | | | |\ \ | ||||||
| | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-01 | 0 | -0/+0 | |
| | | | | | |\ \ | ||||||
| | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-23 | 0 | -0/+0 | |
| | | | | | | |\ \ |