summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add drawGlFunctor support to RenderThread"John Reck2013-12-164-96/+1558
|\
| * Add drawGlFunctor support to RenderThreadJohn Reck2013-12-134-96/+1558
* | Merge "Adding accessor for integer tech codes to Tag"Andres Morales2013-12-161-0/+8
|\ \
| * | Adding accessor for integer tech codes to TagAndres Morales2013-12-161-0/+8
* | | am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Dr...Nick Kralevich2013-12-161-4/+0
|\ \ \
| * \ \ am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loada...Nick Kralevich2013-12-161-4/+0
| |\ \ \
| | * \ \ am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanima...Nick Kralevich2013-12-161-4/+0
| | |\ \ \
| | | * \ \ am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abil...Nick Kralevich2013-12-161-4/+0
| | | |\ \ \
| | | | * \ \ Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."Nick Kralevich2013-12-161-4/+0
| | | | |\ \ \
| | | | | * | | [bootanimation] Drop user loadable bootanimation.zip abiltiy.Robert Craig2013-12-161-4/+0
* | | | | | | | am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc u...Katie McCormick2013-12-161-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarif...Katie McCormick2013-12-161-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of ...Katie McCormick2013-12-161-0/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into ...Katie McCormick2013-12-161-0/+3
| | | |\ \ \ \ \
| | | | * \ \ \ \ am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docsKatie McCormick2013-12-161-0/+3
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge "Doc update: clarify version of flags." into klp-docsKatie McCormick2013-12-161-0/+3
| | | | | |\ \ \ \ \
| | | | | | * | | | | Doc update: clarify version of flags.Katie McCormick2013-12-121-0/+3
* | | | | | | | | | | Merge "Calculate and show Ambient shadow."ztenghui2013-12-1611-95/+595
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Calculate and show Ambient shadow.ztenghui2013-12-1311-95/+595
* | | | | | | | | | | | am 1dfe7990: am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile ...Narayan Kamath2013-12-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of Ja...Narayan Kamath2013-12-161-14/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cer...Narayan Kamath2013-12-161-14/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."Narayan Kamath2013-12-161-14/+16
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "Use StrictJarFile instead of JarFile for cert collection."Narayan Kamath2013-12-161-14/+16
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | | * | | | | | | Use StrictJarFile instead of JarFile for cert collection.Narayan Kamath2013-12-131-14/+16
* | | | | | | | | | | | am 1add7894: am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name...Jesse Hall2013-12-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBu...Jesse Hall2013-12-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wra...Jesse Hall2013-12-151-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"Jesse Hall2013-12-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Fix incorrect name in eglSwapBuffers log wrapper"Jesse Hall2013-12-151-1/+1
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fix incorrect name in eglSwapBuffers log wrapperBrian Harris2013-12-101-1/+1
* | | | | | | | | | | | | resolved conflicts for merge of e0b14ea7 to masterKenny Root2013-12-1317-114/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | / / / / / / | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead o...Kenny Root2013-12-1317-114/+50
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-1317-114/+50
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-1317-114/+50
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-1317-114/+50
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Use java.util.Objects instead on internal APIKenny Root2013-12-1317-114/+50
| | | | |/ / / / / / /
* | | | | | | | | | | am aab51473: Merge "Fix bad xml generation due to mismatched start/end tags" ...Amith Yamasani2013-12-131-151/+178
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modu...Amith Yamasani2013-12-131-151/+178
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix bad xml generation due to mismatched start/end tagsAmith Yamasani2013-12-131-151/+178
* | | | | | | | | | | | Merge commit 'e89a9a3f' into manualmergeAdam Lesinski2013-12-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Introduce a Lifecycle for system services" into klp-modular-devAdam Lesinski2013-12-1331-1581/+2259
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Introduce a Lifecycle for system servicesAdam Lesinski2013-12-1231-1581/+2259
* | | | | | | | | | | | | Merge "Handle user-defined cache path for RS."Tim Murray2013-12-131-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Handle user-defined cache path for RS.Tim Murray2013-12-131-1/+3
* | | | | | | | | | | | | | Merge "3d view system!"Chris Craik2013-12-1318-142/+667
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 3d view system!Chris Craik2013-12-1218-142/+667
* | | | | | | | | | | | | | Fixing some accessibility bugs.Svetoslav2013-12-132-11/+11
* | | | | | | | | | | | | | Merge "Introduce a Lifecycle for system services"Adam Lesinski2013-12-1331-1581/+2259
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Introduce a Lifecycle for system servicesAdam Lesinski2013-12-1231-1581/+2259