summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"Edwin Wong2012-08-032-34/+1
* Revert Widevine 6.0.0 -> 4.5.0 librariesEdwin Wong2012-08-032-1/+34
* Merge "Remove libdrmdecrypt from AOSP build."Fred2012-07-172-30/+0
|\
| * Remove libdrmdecrypt from AOSP build.Fred2012-07-072-30/+0
* | Fixup ion change to old libraryRebecca Schultz Zavin2012-07-096-6/+131
|/
* am 692b0d66: Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
|\
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-260-0/+0
| | |\
* | | \ Merge "Put back old ion library"Rebecca Schultz Zavin2012-06-289-6/+212
|\ \ \ \
| * | | | Put back old ion libraryRebecca Schultz Zavin2012-06-289-6/+212
* | | | | am 35e328cb: am 812f0cdd: fix full_maguro-userdebug buildKeun young Park2012-06-251-0/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 812f0cdd: fix full_maguro-userdebug buildKeun young Park2012-06-251-0/+2
| |\ \ \ | | |/ /
| | * | fix full_maguro-userdebug buildKeun young Park2012-06-251-0/+2
* | | | am b9bf3ee0: Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | | |\
* | | | \ am ca48276c: am c78626b1: CameraHal: Avoids possible race conditions while ac...Emilian Peev2012-05-237-91/+84
|\ \ \ \ \ | |/ / / /
| * | | | am c78626b1: CameraHal: Avoids possible race conditions while accessing \'mPa...Emilian Peev2012-05-237-91/+84
| |\ \ \ \ | | |/ / /
| | * | | CameraHal: Avoids possible race conditions while accessing 'mParams'Emilian Peev2012-05-237-91/+84
| | |/ /
* | | | am 94d807c4: am 8fa731dd: Don\'t include widevine proprietary for panda.Jean-Baptiste Queru2012-05-221-0/+2
|\ \ \ \ | |/ / /
| * | | am 8fa731dd: Don\'t include widevine proprietary for panda.Jean-Baptiste Queru2012-05-221-0/+2
| |\ \ \ | | |/ /
| | * | Don't include widevine proprietary for panda.Jean-Baptiste Queru2012-05-221-0/+2
* | | | am d6204cf0: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ | | | |/ | | |/|
* | | | Revert "hwc: Stash hdmi mode resolution in a property"Mike J. Chen2012-05-221-16/+1
* | | | am ce768b26: hwc: Stash hdmi mode resolution in a propertyMike J. Chen2012-05-211-1/+16
|\ \ \ \
| * | | | hwc: Stash hdmi mode resolution in a propertyMike J. Chen2012-05-211-1/+16
* | | | | am aca35afd: am 16b7f6c4: hwc: Fix truncation errors in scaling decisionLajos Molnar2012-05-211-4/+8
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 16b7f6c4: hwc: Fix truncation errors in scaling decisionLajos Molnar2012-05-211-4/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | hwc: Fix truncation errors in scaling decisionLajos Molnar2012-05-211-4/+8
* | | | | am 7a7d4c25: (-s ours) am 4495a871: Fix secondary builds (AOSP, panda) - do n...Jean-Baptiste Queru2012-05-210-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 4495a871: Fix secondary builds (AOSP, panda) - do not mergeJean-Baptiste Queru2012-05-211-2/+4
| |\ \ \ \ | | |/ / /
| | * | | Fix secondary builds (AOSP, panda) - do not mergeJean-Baptiste Queru2012-05-211-2/+4
* | | | | am 97160be1: (-s ours) DO NOT MERGEMike J. Chen2012-05-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | DO NOT MERGEMike J. Chen2012-05-171-33/+134
* | | | | am c6c812ab: (-s ours) DO NOT MERGE:Mike J. Chen2012-05-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGE:Mike J. Chen2012-05-161-134/+33
* | | | | am fc8f4796: (-s ours) DO NOT MERGEDandawate Saket2012-05-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGEDandawate Saket2012-05-041-23/+28
* | | | | am fff80172: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ | | |/ / / _ | | | | / | | |_|/ | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | |\ \ | |/ / /
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-100-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-080-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-070-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-020-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-010-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | | |\ \