summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4215f434: am 6dbcebd0: Merge "Always release a buffer" into klp-modular-devAndy McFadden2014-04-071-2/+12
|\
| * am 6dbcebd0: Merge "Always release a buffer" into klp-modular-devAndy McFadden2014-04-071-2/+12
| |\
| | * Merge "Always release a buffer" into klp-modular-devAndy McFadden2014-04-071-2/+12
| | |\
| | | * Always release a bufferAndy McFadden2014-04-041-2/+12
* | | | am 75b33203: am 4369a4eb: Revert "Add stringType and requiredPermission to se...Etienne Le Grand2014-04-050-0/+0
|\ \ \ \ | |/ / /
| * | | am 4369a4eb: Revert "Add stringType and requiredPermission to sensors, effect...Etienne Le Grand2014-04-055-234/+51
| |\ \ \ | | |/ /
| | * | Revert "Add stringType and requiredPermission to sensors, effectively adding ...Etienne Le Grand2014-04-055-234/+51
* | | | Revert "Add stringType and requiredPermission to sensors, effectively adding ...Etienne Le Grand2014-04-055-234/+51
* | | | am 00f4dde1: am c57a019e: Add stringType and requiredPermission to sensors, e...Etienne Le Grand2014-04-055-51/+234
|\ \ \ \ | |/ / /
| * | | am c57a019e: Add stringType and requiredPermission to sensors, effectively ad...Etienne Le Grand2014-04-055-51/+234
| |\ \ \ | | |/ /
| | * | Add stringType and requiredPermission to sensors, effectively adding permissi...Etienne Le Grand2014-04-045-51/+234
* | | | Revert "SurfaceFlinger: send VSYNC power hints to IPowerManager"Ruchi Kandoi2014-04-045-63/+34
* | | | SurfaceFlinger: send VSYNC power hints to IPowerManagerRuchi Kandoi2014-04-045-34/+63
* | | | am 17251cd4: am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuati...John Spurlock2014-04-041-0/+1
|\ \ \ \ | |/ / /
| * | | am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.John Spurlock2014-04-041-0/+1
| |\ \ \ | | |/ /
| | * | Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.John Spurlock2014-04-031-0/+1
| | |/
* | | native gui: 64-bit compile issuesMark Salyzyn2014-04-041-2/+4
* | | Merge "Add android.software.managedprofiles feature flag."Adam Connors2014-04-043-7/+33
|\ \ \
| * | | Add android.software.managedprofiles feature flag.Adam Connors2014-04-013-7/+33
* | | | am 3b1cb037: am 27f8840f: Merge "make struct Event layout consistent on 32/64...Greg Hackmann2014-04-041-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"Greg Hackmann2014-04-041-1/+1
| |\ \ \
| | * \ \ Merge "make struct Event layout consistent on 32/64-bit"Greg Hackmann2014-04-031-1/+1
| | |\ \ \
| | | * | | make struct Event layout consistent on 32/64-bitFengwei Yin2014-03-201-1/+1
* | | | | | Update to follow interface change.Dianne Hackborn2014-04-031-0/+1
* | | | | | am fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-031-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-031-2/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AArch64: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-031-2/+4
| | |\ \ \ \
| | | * | | | AArch64: Correction to OMX_U32 and OMX_S32Marcus Oakland2014-04-021-2/+4
* | | | | | | am d09b2acd: am 033bdd72: Merge "Remove global variables from ProcessState."Narayan Kamath2014-04-032-46/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 033bdd72: Merge "Remove global variables from ProcessState."Narayan Kamath2014-04-032-46/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Remove global variables from ProcessState."Narayan Kamath2014-04-032-46/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Remove global variables from ProcessState.Narayan Kamath2014-04-032-46/+0
* | | | | | | Merge "Misc. buttons aren't gamepad keys."Michael Wright2014-04-021-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Misc. buttons aren't gamepad keys.Michael Wright2014-04-021-4/+0
* | | | | | | | PowerManager: add powerHint binder methodRuchi Kandoi2014-04-022-0/+12
* | | | | | | | am fc1544d5: am 17b5ca1e: Merge "opengl: fix UAL conformity"Glenn Kasten2014-04-022-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am 17b5ca1e: Merge "opengl: fix UAL conformity"Glenn Kasten2014-04-022-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "opengl: fix UAL conformity"Glenn Kasten2014-04-022-2/+2
| | |\ \ \ \ \
| | | * | | | | opengl: fix UAL conformitysynergy dev2014-04-022-2/+2
| | |/ / / / /
* | | | | | | Merge "Declare ownership of native_handle_t object"Wonsik Kim2014-04-022-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Declare ownership of native_handle_t objectWonsik Kim2014-03-242-2/+2
* | | | | | | | am b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" ...Jeff Tinker2014-04-011-2/+15
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu...Jeff Tinker2014-04-011-2/+15
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-devJeff Tinker2014-04-011-2/+15
| | |\ \ \ \ \
| | | * | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+15
* | | | | | | | am 4b3d6e31: am 3ebb877e: Merge "Modify installd\'s restorecon function."Nick Kralevich2014-03-312-18/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3ebb877e: Merge "Modify installd\'s restorecon function."Nick Kralevich2014-03-312-18/+69
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "Modify installd's restorecon function."Nick Kralevich2014-03-312-18/+69
| | |\ \ \ \ \ \
| | | * | | | | | Modify installd's restorecon function.Robert Craig2014-03-282-18/+69
| | |/ / / / / /
* | | | | | | | am 6c4e2d81: (-s ours) am 773585e6: Merge "Generate ACTION_CANCEL on joystick...Michael Wright2014-03-280-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /