summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-190-0/+0
| | | |\
| | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-110-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-190-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-130-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-280-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-270-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-150-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-130-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-020-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-010-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fix for build break - missing WVCryptoPlugin.h in full_tuna buildJeff Tinker2012-05-012-10/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Build libdrmdecrypt by linking against new wv static library." into jb...Jeff Tinker2012-05-013-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build libdrmdecrypt by linking against new wv static library.Andreas Huber2012-04-273-0/+37
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Renaming AAC variants to their more technical forms." into jb-devDave Burke2012-04-301-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming AAC variants to their more technical forms.Dave Burke2012-04-301-3/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraHal: Fix for YV12 camera callbacksEmilian Peev2012-04-291-3/+7
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /