summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Surface maxDelay and isWakeUpSensor flag in Sensor.java.Aravind Akella2014-05-234-8/+31
* am 040730e8: am 1236710b: Remove getRequiredPermission from NDK.Aravind Akella2014-05-231-7/+0
|\
| * am 1236710b: Remove getRequiredPermission from NDK.Aravind Akella2014-05-221-7/+0
| |\
| | * Remove getRequiredPermission from NDK.Aravind Akella2014-05-221-7/+0
* | | Merge "Allow "telecomm" service to be registered with the phone UID."Santos Cordon2014-05-221-0/+1
|\ \ \
| * | | Allow "telecomm" service to be registered with the phone UID.Santos Cordon2014-05-211-0/+1
* | | | Merge "opengl: Fix include style in generated JNI code"Jesse Hall2014-05-221-2/+2
|\ \ \ \
| * | | | opengl: Fix include style in generated JNI codeJesse Hall2014-05-201-2/+2
* | | | | Merge "opengl: Un-hide GLES31 and GLES31Ext classes"Jesse Hall2014-05-222-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | opengl: Un-hide GLES31 and GLES31Ext classesJesse Hall2014-05-202-2/+0
* | | | | Merge "opengl: Add GLES31 and GLES31Ext class templates"Jesse Hall2014-05-2251-3/+1006
|\ \ \ \ \ | |/ / / /
| * | | | opengl: Add GLES31 and GLES31Ext class templatesJesse Hall2014-05-2051-3/+1006
* | | | | opengl: Regenerate code with ES 3.1 and new extensionsJesse Hall2014-05-2114-19/+5448
* | | | | opengl: Add EXT_primitive_bounding_box to registryJesse Hall2014-05-212-3/+32
* | | | | opengl: Update registry and headers from KhronosJesse Hall2014-05-215-48/+1833
* | | | | Merge "opengl: Update GLES headers and generate *.in from registry XML"Jesse Hall2014-05-2120-6249/+12304
|\ \ \ \ \
| * | | | | opengl: Update GLES headers and generate *.in from registry XMLJesse Hall2014-05-2120-6249/+12304
* | | | | | Merge "Support VIRTUAL flag in keyboard layouts."Jeff Brown2014-05-211-0/+1
|\ \ \ \ \ \
| * | | | | | Support VIRTUAL flag in keyboard layouts.Jeff Brown2014-05-201-0/+1
* | | | | | | Merge "Add IMPLEMENTATION_DEFINED to dump"Andy McFadden2014-05-201-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add IMPLEMENTATION_DEFINED to dumpAndy McFadden2014-05-201-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge "Revert "Update GLES headers from Khronos SVN r26322""Jesse Hall2014-05-205-2578/+2411
|\ \ \ \ \ \
| * | | | | | Revert "Update GLES headers from Khronos SVN r26322"Jesse Hall2014-05-205-2578/+2411
* | | | | | | Merge "Revert "opengl: Generate *.in from registry XML""Jesse Hall2014-05-2016-9727/+3839
|\ \ \ \ \ \ \
| * | | | | | | Revert "opengl: Generate *.in from registry XML"Jesse Hall2014-05-2016-9727/+3839
* | | | | | | | Merge "Revert "opengl: Update registry and headers from Khronos""Jesse Hall2014-05-205-1833/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "opengl: Update registry and headers from Khronos"Jesse Hall2014-05-205-1833/+48
* | | | | | | | | Merge "Revert "opengl: Add EXT_primitive_bounding_box to registry""Jesse Hall2014-05-202-32/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "opengl: Add EXT_primitive_bounding_box to registry"Jesse Hall2014-05-202-32/+3
* | | | | | | | | | Merge "Revert "opengl: Regenerate code with ES 3.1 and new extensions""Jesse Hall2014-05-2014-5448/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Revert "opengl: Regenerate code with ES 3.1 and new extensions"Jesse Hall2014-05-2014-5448/+19
* | | | | | | | | | Merge "opengl: Regenerate code with ES 3.1 and new extensions"Jesse Hall2014-05-2014-19/+5448
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | opengl: Regenerate code with ES 3.1 and new extensionsJesse Hall2014-05-1914-19/+5448
| |/ / / / / / / /
* | | | | | | | | Merge "opengl: Add EXT_primitive_bounding_box to registry"Jesse Hall2014-05-202-3/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | opengl: Add EXT_primitive_bounding_box to registryJesse Hall2014-05-192-3/+32
| |/ / / / / / /
* | | | | | | | Merge "opengl: Update registry and headers from Khronos"Jesse Hall2014-05-205-48/+1833
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | opengl: Update registry and headers from KhronosJesse Hall2014-05-195-48/+1833
| |/ / / / / /
* | | | | | | Merge "opengl: Generate *.in from registry XML"Jesse Hall2014-05-2016-3839/+9727
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | opengl: Generate *.in from registry XMLJesse Hall2014-05-1916-3839/+9727
| |/ / / / /
* | | | | | Merge "Update GLES headers from Khronos SVN r26322"Jesse Hall2014-05-205-2411/+2578
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update GLES headers from Khronos SVN r26322Jesse Hall2014-05-195-2411/+2578
* | | | | | am 2bb7438c: am c210aec4: Merge "Add android.software.webview software featur...Ben Murdoch2014-05-201-0/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am c210aec4: Merge "Add android.software.webview software feature." into klp-...Ben Murdoch2014-05-201-0/+19
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Add android.software.webview software feature." into klp-modular-devBen Murdoch2014-05-201-0/+19
| | |\ \ \ \
| | | * | | | Add android.software.webview software feature.Ben Murdoch2014-05-191-0/+19
* | | | | | | Merge "New keycode definitions for HDMI-CEC"Jinsuk Kim2014-05-202-0/+10
|\ \ \ \ \ \ \
| * | | | | | | New keycode definitions for HDMI-CECJinsuk Kim2014-05-202-0/+10
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Import GL registry from upstream @r26448."Jesse Hall2014-05-194-0/+45481
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Import GL registry from upstream @r26448.Jesse Hall2014-05-194-0/+45481
* | | | | | | Merge "Remove vestigial remnants of GLES2_dbg"Jesse Hall2014-05-192-254/+0
|\ \ \ \ \ \ \ | |/ / / / / /