summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* GLConsumer: Add query for current frame number.android-4.4_r0.8Eino-Ville Talvala2013-09-202-0/+19
* merge in klp-release history after reset to klp-devThe Android Automerger2013-09-190-0/+0
|\
| * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| |\
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | |\ | | | |/ | | |/|
| | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | |\ \
| | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-090-0/+0
| | | |\ \
| | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-050-0/+0
| | | | |\ \
| | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-040-0/+0
| | | | | |\ \
| | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-020-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-290-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-260-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-220-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-210-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-200-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-190-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * | Disable GLES 2.x renderingAndy McFadden2013-08-151-1/+1
| | | | | | | | | | | | | * | Initialize mIndentAndy McFadden2013-08-151-0/+2
| | | | | | | | | | | | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-08-150-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-140-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-130-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-120-0/+0
| | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-080-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-08-070-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-08-060-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-08-050-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-310-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-07-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-06-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-06-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-06-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in klp-release history after reset to masterThe Android Automerger2013-06-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to masterThe Android Automerger2013-06-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to masterThe Android Automerger2013-06-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to masterThe Android Automerger2013-06-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to masterThe Android Automerger2013-06-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \