OSDN Git Service
Eino-Ville Talvala [Sat, 13 Feb 2016 00:21:30 +0000 (00:21 +0000)]
Merge "Camera: Fix warnings" into nyc-dev
Phil Burk [Tue, 19 Jan 2016 21:05:26 +0000 (13:05 -0800)]
audio.h: add ENCODING_IEC61937
Add audio_has_proportional_frames() to replace
audio_is_linear_pcm() in some cases.
Bug:
24541671
Bug:
20891646
Bug:
26373761
Change-Id: I2ec12068b18bfe46213b79c274a59bfeba884157
Signed-off-by: Phil Burk <philburk@google.com>
Eino-Ville Talvala [Fri, 5 Feb 2016 22:29:29 +0000 (14:29 -0800)]
Camera: Fix warnings
Change-Id: Id627530c8cb8aafb82bef277aa96e6dc2b05fec4
Ralph Nathan [Fri, 5 Feb 2016 19:29:44 +0000 (19:29 +0000)]
Merge "Add an init.rc file for brilloaudioservice." am:
91ce424587
am:
c18ae94d05
* commit '
c18ae94d05c57990014cc7b7660e733cc7ca3bc9':
Add an init.rc file for brilloaudioservice.
Ralph Nathan [Fri, 5 Feb 2016 19:27:54 +0000 (19:27 +0000)]
Merge "Add an init.rc file for brilloaudioservice."
am:
91ce424587
* commit '
91ce424587d589a486a3ef2a25297d82b6bba39f':
Add an init.rc file for brilloaudioservice.
Ralph Nathan [Fri, 5 Feb 2016 19:23:50 +0000 (19:23 +0000)]
Merge "Add an init.rc file for brilloaudioservice."
Ralph Nathan [Thu, 4 Feb 2016 19:10:43 +0000 (11:10 -0800)]
Add an init.rc file for brilloaudioservice.
Start brilloaudioservice on init.
BUG=
26954423
TEST=manual test
Change-Id: I425ad9e1cd71badfd951dc375118c38e94e64581
Glenn Kasten [Wed, 3 Feb 2016 23:07:11 +0000 (23:07 +0000)]
Merge "Add limiter for mono blend"
Dan Albert [Wed, 3 Feb 2016 02:29:07 +0000 (02:29 +0000)]
Merge "Fix warnings in system/media/camera." am:
6ebfda2cbc
am:
25bf9d953e
* commit '
25bf9d953edbafc823487340bd13a712052d9e8e':
Fix warnings in system/media/camera.
Dan Albert [Wed, 3 Feb 2016 02:27:11 +0000 (02:27 +0000)]
Merge "Fix warnings in system/media/camera."
am:
6ebfda2cbc
* commit '
6ebfda2cbc67607cac6e39da03ed6fb421a087a3':
Fix warnings in system/media/camera.
Dan Albert [Wed, 3 Feb 2016 02:23:07 +0000 (02:23 +0000)]
Merge "Fix warnings in system/media/camera."
Dan Albert [Tue, 2 Feb 2016 23:20:52 +0000 (15:20 -0800)]
Fix warnings in system/media/camera.
Bug: http://b/
26936282
Change-Id: Ibc4830838c471272ad25e78a0c1ea098175ac6cc
Glenn Kasten [Thu, 28 Jan 2016 01:21:35 +0000 (17:21 -0800)]
Add limiter for mono blend
Bug:
26904791
Change-Id: Ic325d0ab328e1c7ffea2ea04bf3fc13cd3742285
Ralph Nathan [Thu, 28 Jan 2016 21:58:15 +0000 (21:58 +0000)]
Merge "brillo: Add service to detect audio devices." am:
3c8d4e1992
am:
bff68e3238
* commit '
bff68e3238de1f12ec383a939e6d3c59c4218f56':
brillo: Add service to detect audio devices.
Ralph Nathan [Thu, 28 Jan 2016 21:55:49 +0000 (21:55 +0000)]
Merge "brillo: Add service to detect audio devices."
am:
3c8d4e1992
* commit '
3c8d4e1992315c778bd547dade13a71f6bb9e461':
brillo: Add service to detect audio devices.
Ralph Nathan [Thu, 28 Jan 2016 21:51:16 +0000 (21:51 +0000)]
Merge "brillo: Add service to detect audio devices."
Ryan Bavetta [Thu, 28 Jan 2016 03:06:30 +0000 (03:06 +0000)]
Merge "Adds fields for SoundTrigger GenericSoundModel"
Ryan Bavetta [Wed, 27 Jan 2016 05:07:43 +0000 (21:07 -0800)]
Adds fields for SoundTrigger GenericSoundModel
BUG:
22860713
Change-Id: I653e915a6c68c185910505e1ca765efe6cd96f1f
Ralph Nathan [Thu, 7 Jan 2016 23:10:32 +0000 (15:10 -0800)]
brillo: Add service to detect audio devices.
Add a native service to detect when audio devices are connected to the
headphone jack and inform the audio system.
BUG=
25981491
TEST=manual test on abox_edge + unittests
Change-Id: Ia1ac9efe3008d81b1445c3e471d9c47bb042d921
Eino-Ville Talvala [Tue, 26 Jan 2016 23:01:12 +0000 (23:01 +0000)]
Merge "Camera: Add LEVEL_3 to android.info.supportedHardwareLevel"
Yin-Chia Yeh [Tue, 26 Jan 2016 21:26:56 +0000 (13:26 -0800)]
Camera: fix typos
Change-Id: I98dfd47b6d28f8d1e89e5e82bcc0cd83556f1bd0
Yin-Chia Yeh [Wed, 23 Dec 2015 00:25:00 +0000 (16:25 -0800)]
Camera: codegen NDK metadata tag header
Bug:
23012001
Change-Id: I049eb42fcf2103854179d841a3dfb51f728905bc
Yin-Chia Yeh [Sat, 23 Jan 2016 23:05:09 +0000 (23:05 +0000)]
Merge "Camera: add post RAW sensitivity keys"
Yin-Chia Yeh [Tue, 19 Jan 2016 03:14:55 +0000 (19:14 -0800)]
Camera: add post RAW sensitivity keys
Bug:
26625646
Change-Id: I6c58d5a3da0e5091063eb3a6f746ba28ced45410
Eino-Ville Talvala [Thu, 21 Jan 2016 20:23:56 +0000 (12:23 -0800)]
Camera: Add LEVEL_3 to android.info.supportedHardwareLevel
LEVEL_3 is a new high-level label for camera devices that support more
than the existing FULL-level capabilities.
Bug:
25114814
Change-Id: I6704306a562d7edd65db53c078bdc672a4837931
Eric Laurent [Thu, 21 Jan 2016 00:04:28 +0000 (00:04 +0000)]
Merge "Add multi-mic support for the noise suppression pre-processing effect" am:
178f42026d
am:
b67e1937b0
* commit '
b67e1937b0284f90677d165e0cff845a2d862ab2':
Add multi-mic support for the noise suppression pre-processing effect
Eric Laurent [Wed, 20 Jan 2016 23:53:35 +0000 (23:53 +0000)]
Merge "Add multi-mic support for the noise suppression pre-processing effect"
am:
178f42026d
* commit '
178f42026d202f9ae979a5d1575ced5e5e3febbc':
Add multi-mic support for the noise suppression pre-processing effect
Eric Laurent [Wed, 20 Jan 2016 23:35:52 +0000 (23:35 +0000)]
Merge "Add multi-mic support for the noise suppression pre-processing effect"
Alex Luebs [Tue, 15 Dec 2015 05:33:45 +0000 (21:33 -0800)]
Add multi-mic support for the noise suppression pre-processing effect
Change-Id: Id0b5b72c039e4a35bc5b3d58d9ce0f5895f51170
Phil Burk [Sat, 16 Jan 2016 06:10:04 +0000 (22:10 -0800)]
audio.h: Add AUDIO_FLAG_LOW_LATENCY
Needed by ag/841470
Allows Java to write directly to the FastMixer to
reduce latency.
Bug:
21019153
Change-Id: I2b8c4e0c29b714cf5cfb2b90648f99c96a1463cb
Signed-off-by: Phil Burk <philburk@google.com>
Andy Hung [Fri, 8 Jan 2016 23:17:55 +0000 (23:17 +0000)]
Merge "audio_utils: add mono_blend conversion"
Glenn Kasten [Thu, 7 Jan 2016 15:54:44 +0000 (15:54 +0000)]
Merge "Use FCC_2 and FCC_8 to highlight channel count assumptions"
Ricardo Garcia [Wed, 6 Jan 2016 19:25:39 +0000 (19:25 +0000)]
Merge "Adding UNPROCESSED to the available audio_sources"
Andy Hung [Sat, 19 Dec 2015 01:37:19 +0000 (17:37 -0800)]
audio_utils: add mono_blend conversion
Bug:
22700363
Change-Id: I6420617add71ee7fe5e59e606d4a3e31521033aa
rago [Wed, 2 Dec 2015 19:43:32 +0000 (11:43 -0800)]
Adding UNPROCESSED to the available audio_sources
bug:
25564291
Change-Id: If6b7212fc2b8ae94678f7024c7bf5a000112d0a6
Glenn Kasten [Mon, 14 Dec 2015 20:20:28 +0000 (12:20 -0800)]
Use FCC_2 and FCC_8 to highlight channel count assumptions
Bug:
21656069
Change-Id: I3486b9e48856d703d1ff37f509ab7f1140a6a146
Glenn Kasten [Wed, 2 Dec 2015 22:05:53 +0000 (14:05 -0800)]
Add Doxyfile for Doxygen
Change-Id: Id717790f18e10061d1d7739a262088c3895b6155
Glenn Kasten [Tue, 5 Jan 2016 16:38:31 +0000 (08:38 -0800)]
Update Doxygen comments
Change-Id: I5a4405305e9deb100a2a52fe7f1686e54fe53af3
Yin-Chia Yeh [Wed, 9 Dec 2015 01:45:14 +0000 (01:45 +0000)]
Merge "Camera: define opaqueRawSize static metadata"
Yin-Chia Yeh [Mon, 7 Dec 2015 05:42:35 +0000 (21:42 -0800)]
Camera: define opaqueRawSize static metadata
To describe the size of an opaque RAW buffer.
Bug:
25596619
Change-Id: I119df8f6fafbf24491d29ede7df9f01e0fe39d10
Yin-Chia Yeh [Mon, 7 Dec 2015 20:30:43 +0000 (20:30 +0000)]
Merge "Camera: update new CTS path for metadata-generate script"
Yin-Chia Yeh [Sun, 6 Dec 2015 01:20:33 +0000 (17:20 -0800)]
Camera: update new CTS path for metadata-generate script
Change-Id: Ief925fc8ed3c2509a9b87a6cb6b220d33ab38332
Yin-Chia Yeh [Sat, 5 Dec 2015 00:23:16 +0000 (16:23 -0800)]
Camera: update FPS range spec am:
30bf75b88a am:
137dfd45df
am:
d858bc49ed
* commit '
d858bc49ed6bb69006b6bc8df8767e0dcf1c4c8b':
Camera: update FPS range spec
Yin-Chia Yeh [Sat, 5 Dec 2015 00:20:09 +0000 (16:20 -0800)]
Camera: update FPS range spec am:
30bf75b88a
am:
137dfd45df
* commit '
137dfd45dfed5ba7176bfd6688b1ca3c447482db':
Camera: update FPS range spec
Yin-Chia Yeh [Sat, 5 Dec 2015 00:02:40 +0000 (16:02 -0800)]
Camera: update FPS range spec
am:
30bf75b88a
* commit '
30bf75b88a25a49fdd388fc3c5a77ecbdede2e24':
Camera: update FPS range spec
Glenn Kasten [Thu, 3 Dec 2015 00:18:23 +0000 (00:18 +0000)]
Merge "Fix build warning"
Glenn Kasten [Wed, 2 Dec 2015 22:22:27 +0000 (22:22 +0000)]
Merge "Add README for audio_utils tests"
Glenn Kasten [Wed, 2 Dec 2015 22:01:58 +0000 (14:01 -0800)]
Add README for audio_utils tests
Change-Id: I808efa831a2848a16608e57d9866575063093c11
Glenn Kasten [Wed, 2 Dec 2015 21:58:04 +0000 (13:58 -0800)]
Fix build warning
Change-Id: I4619c0924e52076b0965875ffb2d297ddc8bcec7
Yin-Chia Yeh [Fri, 20 Nov 2015 23:16:05 +0000 (15:16 -0800)]
Camera: update FPS range spec
Bug:
25427163
Change-Id: Id020b051f0ee082f9883f9a73fa3ac34540c0cfc
Zhijun He [Tue, 24 Nov 2015 22:24:52 +0000 (14:24 -0800)]
camera metadata: update dynamic black level type
They should be floats rather than integers for better precision.
Bug:
23011454
Change-Id: I8c10ff0bc5f07f1d53cdbda36da55b4483f721aa
Zhijun He [Fri, 13 Nov 2015 01:27:27 +0000 (17:27 -0800)]
camera_metadata: add dynamic black level support
Also add the optical black regions static memtadata.
Bug:
23011454
Change-Id: I217f33e89e046991f4cded7f7213ce6793ec4e68
Eino-Ville Talvala [Thu, 12 Nov 2015 01:30:49 +0000 (01:30 +0000)]
Camera: Documentation updates am:
04292697a7 am:
ebfd7b869b
am:
9cb7c0b212
* commit '
9cb7c0b2124b987ac71cada3d203364aa165eb17':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:27:01 +0000 (01:27 +0000)]
Camera: Documentation updates am:
04292697a7
am:
ebfd7b869b
* commit '
ebfd7b869b931ddb2b3038ff4ee129a8d436e24e':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:11:01 +0000 (01:11 +0000)]
Camera: Documentation updates
am:
04292697a7
* commit '
04292697a7841d6e45e0355c9dc3ced3bbedc768':
Camera: Documentation updates
Eino-Ville Talvala [Mon, 9 Nov 2015 02:58:27 +0000 (18:58 -0800)]
Camera: Documentation updates
- Use preCorrectionActiveArray instead of activeArray
for one of the possible sizes for raw outputs.
Bug:
23908116
Change-Id: I5f7efb4e399f392b9442ad458335eb0b4777e35c
Sanket Agarwal [Thu, 8 Oct 2015 00:16:21 +0000 (17:16 -0700)]
Add clock to radio metadata.
Bug: b/
24807501
Bug: b/
22701655
Change-Id: I91c3471f92d2c9600c7a30ceb48fbb25dbc5feea
(cherry picked from commit
f59f3ce4728467ab745906c50330413b7d848072)
Paul Mclean [Thu, 5 Nov 2015 17:00:08 +0000 (17:00 +0000)]
Merge "USB MONOtization issue fix."
Paul McLean [Tue, 3 Nov 2015 20:25:24 +0000 (12:25 -0800)]
USB MONOtization issue fix.
Profile default outputs to STEREO if available.
Profile default to 48K or 44.1K if available.
Bug:
24366970
Change-Id: Ib3685668ede236d3faf79cd9a471ba0f0bb641c6
Bill Yi [Tue, 3 Nov 2015 23:47:49 +0000 (23:47 +0000)]
Bill Yi [Tue, 3 Nov 2015 23:34:19 +0000 (23:34 +0000)]
Bill Yi [Tue, 3 Nov 2015 22:30:41 +0000 (14:30 -0800)]
Gaurav Shah [Tue, 3 Nov 2015 13:47:34 +0000 (13:47 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files" am:
280293d781 am:
c40280be63
am:
f6b01ef787
* commit '
f6b01ef7872fc6c3f9f5df3c833b8738f9c62330':
system/media: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Mon, 2 Nov 2015 22:29:52 +0000 (22:29 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files" am:
280293d781
am:
c40280be63
* commit '
c40280be637e8b1fa13dc20c84edc6cc61e27853':
system/media: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Mon, 2 Nov 2015 22:27:03 +0000 (22:27 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files"
am:
280293d781
* commit '
280293d781462aff867d92603787c15b222f0c33':
system/media: Add NOTICE and MODULE_LICENSE_* files
Gaurav Shah [Mon, 2 Nov 2015 22:21:34 +0000 (22:21 +0000)]
Merge "system/media: Add NOTICE and MODULE_LICENSE_* files"
Glenn Kasten [Fri, 30 Oct 2015 21:02:57 +0000 (14:02 -0700)]
Minimal Doxygen
Changed just enough so that output of Doxygen is not ugly.
Did not attempt to add more comments, or fully use Doxygen.
Change-Id: Ia2ec947fd5b249db50fef7cc9feb9ad061019564
Gaurav Shah [Fri, 2 Oct 2015 22:46:19 +0000 (15:46 -0700)]
system/media: Add NOTICE and MODULE_LICENSE_* files
BUG:
24604193
Change-Id: Ibaa4513028f876134d4bff970e69f708c2435d35
Glenn Kasten [Wed, 21 Oct 2015 19:55:01 +0000 (12:55 -0700)]
Add missing delete[]
Change-Id: I15c0ecb49d0e82db05e6857c338aa7c07b35598c
Andy Hung [Fri, 9 Oct 2015 16:33:02 +0000 (16:33 +0000)]
am
7cef57aa: am
dce0eca3: fix usb audio for devices with more than 8 channels
* commit '
7cef57aa96bf6387e81d7e88452eb0c36b52d3d6':
fix usb audio for devices with more than 8 channels
Andy Hung [Fri, 9 Oct 2015 16:28:57 +0000 (16:28 +0000)]
am
dce0eca3: fix usb audio for devices with more than 8 channels
* commit '
dce0eca34eab2016d6d11cb32f072db4079a4461':
fix usb audio for devices with more than 8 channels
Jianing Wei [Fri, 2 Oct 2015 02:34:23 +0000 (02:34 +0000)]
am
eec5fcc1: am
2d950898: Camera: update video stabilization API doc.
* commit '
eec5fcc1c3e98f39ef733381b235ce32e79bd0b5':
Camera: update video stabilization API doc.
Jianing Wei [Fri, 2 Oct 2015 02:29:21 +0000 (02:29 +0000)]
am
2d950898: Camera: update video stabilization API doc.
* commit '
2d950898d4dc311ecfd2b64ea8880656dd6a14fa':
Camera: update video stabilization API doc.
Andy Hung [Mon, 28 Sep 2015 23:31:54 +0000 (16:31 -0700)]
fix usb audio for devices with more than 8 channels
Use the lowest 8 channels.
Bug:
24468939
Change-Id: If116133ab3c902cc6d431b287058897c8e3af875
(cherry picked from commit
67c63b290460f36f7841d6f01017bb116a2a36f1)
Colin Cross [Thu, 1 Oct 2015 00:50:46 +0000 (00:50 +0000)]
am
c181b872: am
209b49f9: am
24ba4816: Merge "Update libaudioutils for host"
* commit '
c181b872ca0be1c4eee5b91689445934be17153b':
Update libaudioutils for host
Colin Cross [Thu, 1 Oct 2015 00:46:57 +0000 (00:46 +0000)]
am
209b49f9: am
24ba4816: Merge "Update libaudioutils for host"
* commit '
209b49f902ba6f4945c32720db65e359a5c43cd2':
Update libaudioutils for host
Colin Cross [Thu, 1 Oct 2015 00:38:57 +0000 (00:38 +0000)]
am
24ba4816: Merge "Update libaudioutils for host"
* commit '
24ba4816f378b0f87011ced509f873d437969760':
Update libaudioutils for host
Colin Cross [Thu, 1 Oct 2015 00:33:45 +0000 (00:33 +0000)]
Merge "Update libaudioutils for host"
Glenn Kasten [Wed, 14 Jan 2015 01:04:09 +0000 (17:04 -0800)]
Update libaudioutils for host
Change-Id: Ic10f786952dffc29e3ce0399cb72ce1cec4055e2
(cherry picked from commit
4504b3372c0979614e2abcc6b3fa463dcd4d141b)
Glenn Kasten [Wed, 30 Sep 2015 23:58:18 +0000 (23:58 +0000)]
Glenn Kasten [Wed, 30 Sep 2015 23:58:17 +0000 (23:58 +0000)]
am
db778f49: am
5f125ab1: resolved conflicts for
dd82cb0f to stage-aosp-master
* commit '
db778f498a657c08096fb4abde5a23bea52a709c':
Add fifo_tests
Glenn Kasten [Wed, 30 Sep 2015 23:51:04 +0000 (23:51 +0000)]
am
14b65781: am
50382728: Merge "Fix Mac build"
* commit '
14b65781f2e13b19ca294c88052aafd84ad4ccdf':
Fix Mac build
Glenn Kasten [Wed, 30 Sep 2015 23:51:03 +0000 (23:51 +0000)]
am
5f125ab1: resolved conflicts for
dd82cb0f to stage-aosp-master
* commit '
5f125ab174f7d7a9e10a47f6af16cdd85c0253a7':
Add fifo_tests
Glenn Kasten [Wed, 30 Sep 2015 23:43:53 +0000 (23:43 +0000)]
am
50382728: Merge "Fix Mac build"
* commit '
503827280a2addfbc1215c891d80ce9258732e89':
Fix Mac build
Glenn Kasten [Wed, 30 Sep 2015 23:39:47 +0000 (16:39 -0700)]
resolved conflicts for
dd82cb0f to stage-aosp-master
Change-Id: I783e4dac71eb568fdd527399a95b270c0e6f7090
Glenn Kasten [Wed, 30 Sep 2015 21:49:26 +0000 (21:49 +0000)]
Merge "Fix Mac build"
Glenn Kasten [Wed, 30 Sep 2015 21:49:06 +0000 (21:49 +0000)]
Merge "Add fifo_tests"
Jim Miller [Sat, 6 Jun 2015 00:34:31 +0000 (17:34 -0700)]
Fix Mac build
ssize_t wasn't being picked because system headers weren't included
first.
Change-Id: I7748fedaa0c85ed9696e8ef77b0086ecf17ebe29
Glenn Kasten [Wed, 14 Jan 2015 00:25:39 +0000 (16:25 -0800)]
Add fifo_tests
Change-Id: I62a783bf551fd6c6c9e734b550f8bcc4e2a32df3
Jianing Wei [Tue, 29 Sep 2015 21:01:43 +0000 (14:01 -0700)]
Camera: update video stabilization API doc.
Update the video stabilization API description
to specify which scenarios guarantee stabilization
is performed if the control is set to ON and the
static metadata supports stabilization ON.
Bug:
23353979
Change-Id: I0f8662864e1c397c0a53edf11a685de2f6feb7f2
Andy Hung [Mon, 28 Sep 2015 23:31:54 +0000 (16:31 -0700)]
fix usb audio for devices with more than 8 channels
Use the lowest 8 channels.
Bug:
24468939
Change-Id: If116133ab3c902cc6d431b287058897c8e3af875
Eino-Ville Talvala [Sat, 19 Sep 2015 20:00:14 +0000 (20:00 +0000)]
am
563c5166: am
eac7b41c: Merge "camera: allow 0-sized metadata entries"
* commit '
563c5166f104621d97fbc17eb4b152182decb6b8':
camera: allow 0-sized metadata entries
Eino-Ville Talvala [Sat, 19 Sep 2015 19:52:20 +0000 (19:52 +0000)]
am
eac7b41c: Merge "camera: allow 0-sized metadata entries"
* commit '
eac7b41cd6929deab56f2cf9e4e918be75bf826c':
camera: allow 0-sized metadata entries
Eino-Ville Talvala [Fri, 18 Sep 2015 21:04:17 +0000 (21:04 +0000)]
Merge "camera: allow 0-sized metadata entries"
David Schalig [Sun, 15 Jun 2014 18:22:50 +0000 (11:22 -0700)]
camera: allow 0-sized metadata entries
0-sized metadata entries were rejected in
update_camera_metadata_entry() when the data pointer
was NULL, but accepted when it was not NULL.
This prevents return of empty array-type camera properties,
which is a valid case for some dynamic properties, e.g.
number of detected face rectangles.
Change-Id: I4e69d889fb416fd256a81e877f3a5aa43c253796
Signed-off-by: David Schalig <dschalig@nvidia.com>
Eino-Ville Talvala [Thu, 27 Aug 2015 12:20:58 +0000 (12:20 +0000)]
am
c3b3e366: (-s ours) am
c572dfc4: Camera: Fix spelling of quaternion, fix metadata ordering issue
* commit '
c3b3e366b86aa7e16693d67b1ebe955c46b3c067':
Glenn Kasten [Thu, 27 Aug 2015 12:20:57 +0000 (12:20 +0000)]
am
1431a49a: (-s ours) am
80f17ac6: Merge "Add USB proxy_get_presentation_position() for timestamps" into mnc-dev
* commit '
1431a49ab0a78e321564d7d0955069fb773c7a49':
Phil Burk [Thu, 27 Aug 2015 12:20:55 +0000 (12:20 +0000)]
am
e31d70c4: (-s ours) am
cf6443f4: Audio HAL API: add bit for compressed audio
* commit '
e31d70c4a65f89ef2e4c80741010659b54005732':
Chien-Yu Chen [Thu, 27 Aug 2015 12:20:54 +0000 (12:20 +0000)]
am
6b45aace: (-s ours) am
8b6721ca: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit '
6b45aace870adab6c5d5156a1d1befd727a20e1a':
Yin-Chia Yeh [Thu, 27 Aug 2015 12:20:52 +0000 (12:20 +0000)]
am
66884d2b: (-s ours) am
570c195f: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
* commit '
66884d2ba601046829d8791828ed330b60739a33':