summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f8954c81: Merge "OpenGL tests: Fix unused variables"Andreas Gampe2014-12-024-18/+0
|\
| * Merge "OpenGL tests: Fix unused variables"Andreas Gampe2014-12-024-18/+0
| |\
| | * OpenGL tests: Fix unused variablesAndreas Gampe2014-11-244-18/+0
* | | am 4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"Jesse Hall2014-12-021-10/+6
|\ \ \ | |/ /
| * | Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"Jesse Hall2014-12-021-10/+6
| |\ \
| | * | Avoid overwriting EGL14.EGL_NO_SURFACESangkyu Lee2014-11-251-10/+6
* | | | am 80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel"Dan Stoza2014-12-012-0/+18
|\ \ \ \ | |/ / /
| * | | Merge "binder: Add {read,write}Uint32 methods to Parcel"Dan Stoza2014-12-012-0/+18
| |\ \ \
| | * | | binder: Add {read,write}Uint32 methods to ParcelDan Stoza2014-12-012-0/+18
| |/ / /
* | | | am 104e1259: Merge "binder: Return pid_t/uid_t instead of int"Dan Stoza2014-12-012-4/+4
|\ \ \ \ | |/ / /
| * | | Merge "binder: Return pid_t/uid_t instead of int"Dan Stoza2014-12-012-4/+4
| |\ \ \
| | * | | binder: Return pid_t/uid_t instead of intDan Stoza2014-12-012-4/+4
| |/ / /
* | | | am 46ca041f: Merge "Don\'t error out because SensorEventConnection::dump over...Chih-hung Hsieh2014-11-251-0/+7
|\ \ \ \ | |/ / /
| * | | Merge "Don't error out because SensorEventConnection::dump overloads BBinder:...Chih-hung Hsieh2014-11-251-0/+7
| |\ \ \
| | * | | Don't error out because SensorEventConnection::dump overloads BBinder::dumpBernhard Rosenkränzer2014-11-251-0/+7
| |/ / /
* | | | am 2d7ec9d7: Merge "Fix build with clang in C++11 mode"Chih-hung Hsieh2014-11-251-6/+6
|\ \ \ \ | |/ / /
| * | | Merge "Fix build with clang in C++11 mode"Chih-hung Hsieh2014-11-251-6/+6
| |\ \ \ | | |_|/ | |/| |
| | * | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-251-6/+6
| |/ /
* | | am 45aa0227: Merge "Fix potential format string vulnerability"chh2014-11-251-6/+3
|\ \ \ | |/ /
| * | Merge "Fix potential format string vulnerability"chh2014-11-251-6/+3
| |\ \
| | * | Fix potential format string vulnerabilityBernhard Rosenkränzer2014-11-241-6/+3
| |/ /
* | | am 2e42a906: Merge "Binder: Remove unused functions & variables"Andreas Gampe2014-11-252-10/+0
|\ \ \ | |/ /
| * | Merge "Binder: Remove unused functions & variables"Andreas Gampe2014-11-242-10/+0
| |\ \
| | * | Binder: Remove unused functions & variablesAndreas Gampe2014-11-242-10/+0
| |/ /
* | | am b947f29a: Merge "Add clamp to Layer and update Transform inverse." into lm...Michael Lentine2014-11-252-17/+29
|\ \ \
| * \ \ Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-devMichael Lentine2014-11-252-17/+29
| |\ \ \
| | * | | Add clamp to Layer and update Transform inverse.Michael Lentine2014-11-212-17/+29
* | | | | am e8a4dce8: Merge "Work on issue #18486438: Reduce size of bugreport output"...Dianne Hackborn2014-11-251-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1...Dianne Hackborn2014-11-241-3/+0
| |\ \ \ \
| | * | | | Work on issue #18486438: Reduce size of bugreport outputDianne Hackborn2014-11-211-3/+0
* | | | | | am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features...Eino-Ville Talvala2014-11-244-0/+47
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Camera: Add XML entries and files for new system features" into lmp-mr...Eino-Ville Talvala2014-11-224-0/+47
| |\ \ \ \ \
| | * | | | | Camera: Add XML entries and files for new system featuresEino-Ville Talvala2014-11-214-0/+47
| | |/ / / /
* | | | | | am 8e5fdac4: Merge "Mark 2 unused paramters as such"Narayan Kamath2014-11-240-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Mark 2 unused paramters as such"Narayan Kamath2014-11-241-2/+2
| |\ \ \ \ \
| | * | | | | Mark 2 unused paramters as suchBernhard Rosenkränzer2014-11-231-2/+2
| |/ / / / /
* | | | | | am e0f91c37: Merge "We HAVE_LITTLE_ENDIAN."Elliott Hughes2014-11-221-5/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "We HAVE_LITTLE_ENDIAN."Elliott Hughes2014-11-221-5/+0
| |\ \ \ \ \
| | * | | | | We HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-211-5/+0
| |/ / / / /
* | | | | | am e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp...Greg Hackmann2014-11-211-8/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-devGreg Hackmann2014-11-211-8/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | atrace: make fs-specific sysfs entries optionalGreg Hackmann2014-11-201-8/+8
| | | |/ / | | |/| |
* | | | | am 754f16fc: Merge "Fix installd command line parser"Mike Lockwood2014-11-211-1/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Fix installd command line parser"Mike Lockwood2014-11-211-1/+3
| |\ \ \ \
| | * | | | Fix installd command line parserSerguei Katkov2014-11-051-1/+3
* | | | | | am a63caa19: Merge "omx: add (temporary) index for automatic video frc suppor...Lajos Molnar2014-11-202-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "omx: add (temporary) index for automatic video frc support" into lmp-m...Lajos Molnar2014-11-202-1/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | omx: add (temporary) index for automatic video frc supportLajos Molnar2014-11-192-1/+2
| | * | | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-170-0/+0
| | |\ \ \ \
| | | * | | | Fix issue #18356768: some app process may hang at Runtime#exit...Dianne Hackborn2014-11-133-25/+22