summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am ece62384: Merge "Remove Parcel::writeIntPtr."Narayan Kamath2014-06-131-1/+0
|\
| * Remove Parcel::writeIntPtr.Narayan Kamath2014-06-131-1/+0
* | am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"Narayan Kamath2014-06-032-8/+16
|\ \ | |/
| * Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"Narayan Kamath2014-06-032-8/+16
| |\
| | * x86_64: Align uint64_t/int64_t structure member to 8 bytesFengwei Yin2014-05-302-8/+16
* | | am 9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-devEtienne Le Grand2014-05-271-0/+7
|\ \ \
| * \ \ Merge "Add heart rate to ASensorEvent" into klp-modular-devEtienne Le Grand2014-05-271-0/+7
| |\ \ \
| | * | | Add heart rate to ASensorEventEtienne Le Grand2014-05-231-0/+7
* | | | | am 1236710b: Remove getRequiredPermission from NDK.Aravind Akella2014-05-221-7/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove getRequiredPermission from NDK.Aravind Akella2014-05-221-7/+0
| |/ / /
* | | | am cfba3bf1: am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a ...Narayan Kamath2014-05-161-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."Narayan Kamath2014-05-161-3/+3
| |\ \ \ | | | |/ | | |/|
| | * | Change InputMessage.motion.pointerSize to a uint32_t.Narayan Kamath2014-05-161-3/+3
* | | | am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-122-0/+13
|\ \ \ \ | |/ / /
| * | | am bd20e551: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-122-0/+13
| |\ \ \ | | |/ /
| | * | Use asynchronous lock/unlock APIFrancis Hart2014-05-122-0/+13
* | | | am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""Greg Hackmann2014-05-092-13/+0
|\ \ \ \ | |/ / /
| * | | am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""Greg Hackmann2014-05-092-13/+0
| |\ \ \ | | |/ /
| | * | Revert "Use asynchronous lock/unlock API"Greg Hackmann2014-05-092-13/+0
* | | | am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-092-0/+13
|\ \ \ \ | |/ / /
| * | | am f60564a1: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-092-0/+13
| |\ \ \ | | |/ /
| | * | Use asynchronous lock/unlock APIFrancis Hart2014-05-022-0/+13
| * | | Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEADBill Yi2014-04-291-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | am f0190bff: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-141-0/+1
| | |\ \
* | | \ \ am cf818ebb: Merge "Add stringType and requiredPermission to sensors, effecti...Aravind Akella2014-04-112-0/+28
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Add stringType and requiredPermission to sensors, effectively adding p...Aravind Akella2014-04-112-0/+28
| |\ \ \ \
| | * | | | Add stringType and requiredPermission to sensors, effectively adding permissi...Aravind Akella2014-04-112-0/+28
* | | | | | am db19e463: Remove unnecessary policy flags.Jeff Brown2014-04-111-7/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove unnecessary policy flags.Jeff Brown2014-04-091-7/+3
| |/ / / /
* | | | | am 4369a4eb: Revert "Add stringType and requiredPermission to sensors, effect...Etienne Le Grand2014-04-052-28/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Add stringType and requiredPermission to sensors, effectively adding ...Etienne Le Grand2014-04-052-28/+0
* | | | | am c57a019e: Add stringType and requiredPermission to sensors, effectively ad...Etienne Le Grand2014-04-052-0/+28
|\ \ \ \ \ | |/ / / /
| * | | | Add stringType and requiredPermission to sensors, effectively adding permissi...Etienne Le Grand2014-04-042-0/+28
* | | | | 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
* | | | | 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
| | | |/ / | | |/| |
* | | | | 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 033bdd72: Merge "Remove global variables from ProcessState."Narayan Kamath2014-04-031-11/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove global variables from ProcessState.Narayan Kamath2014-04-031-11/+0
| |/ / /
* | | | 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 773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MER...Michael Wright2014-03-281-3/+8
|\ \ \ \ \ | |/ / / /
| * | | | Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGEMichael Wright2014-03-241-3/+8
| |/ / /
* | | | am b730a452: am f0190bff: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-141-0/+1
|\ \ \ \ | |/ / /
| * | | am f0190bff: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-141-0/+1
| |\ \ \ | | | |/ | | |/|