OSDN Git Service

resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
[android-x86/system-media.git] / private /
2016-08-17 Eino-Ville Talvalaresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55...
2016-08-17 Eino-Ville Talvalaresolve merge conflicts of 28ce9cd to lmp-dev
2016-08-17 Chien-Yu ChenCamera: Prevent data size overflow am: 97a9cd6748 am...
2016-08-17 Chien-Yu ChenCamera: Prevent data size overflow am: 97a9cd6748 am...
2015-10-01 Colin Crossam 24ba4816: Merge "Update libaudioutils for host"
2015-09-30 Glenn Kastenam 50382728: Merge "Fix Mac build"
2015-09-30 Glenn Kastenresolved conflicts for dd82cb0f to stage-aosp-master
2015-09-19 Eino-Ville Talvalaam eac7b41c: Merge "camera: allow 0-sized metadata...
2015-06-04 Glenn Kastenam 289eb080: Merge "audio_route: add support for MIXER_...
2015-03-31 Etan CohenMerge commit '18162c622ab4ac8e51a21b9a5ae9b40aff5b478e...
2015-03-16 Eric LaurentMerge "radio meta data utility library"
2015-03-12 Eric Laurentradio meta data utility library
2014-09-12 Dan Albertam 89a2450a: Merge "Remove makefile cruft."
2014-06-23 Narayan Kamatham 35a7543a: am 77f0f32b: Merge "camera_metadata: updat...
2014-06-23 Narayan Kamatham a1cb1d5c: (-s ours) am 5a301aee: Merge "LP64 fixes...
2014-06-06 Narayan Kamatham 4efffd39: (-s ours) am a34e4dfd: Merge "Build camera...
2014-05-22 Elliott Hughesresolved conflicts for merge of eb5d1723 to master
2014-04-30 Glenn Kastenam ab03736c: am db7e74ec: am e0b59251: Merge "Added...
2014-04-30 Bill Yiam 6c7b41e5: am be6b522c: Merge commit \'acdc8dc1463fcd...
2014-04-17 Mark Salyzynam 2c3197e3: am 3853fae2: Merge "media: echo_reference...
2014-03-26 Glenn Kastenam 8818dd66: am 77828c90: Merge "Fixes for LP64"
2014-03-25 Colin Crossam a275d476: am fecd69c0: Merge "Revert "Update 64...
2014-03-14 Glenn Kastenam 73457221: am 81e7e452: Merge "Update 64-bit blacklis...
2014-03-14 Narayan Kamathresolved conflicts for merge of 8b91acde to master
2014-03-14 Mark Salyzynam ebb95847: am b7f55262: Merge "libcamera_metadata...
2014-03-13 Ruben BrunkMerge "camera3: Pass vendor tags through binder."
2014-03-13 Ruben Brunkcamera3: Pass vendor tags through binder.