OSDN Git Service
Glenn Kasten [Thu, 19 Jan 2012 14:10:36 +0000 (06:10 -0800)]
am
e119bd14: Merge "Replace run-time stream types by compile-time"
* commit '
e119bd144207b9b89ec7d52ee619bdbcda8ab497':
Replace run-time stream types by compile-time
Glenn Kasten [Thu, 19 Jan 2012 14:08:12 +0000 (06:08 -0800)]
Merge "Replace run-time stream types by compile-time"
Jeff Brown [Thu, 19 Jan 2012 02:33:03 +0000 (18:33 -0800)]
am
6534c0e0: Merge "Fix issues with reentrant SQLite triggers."
* commit '
6534c0e0548332801cffaa0977af165025030297':
Fix issues with reentrant SQLite triggers.
Jeff Brown [Thu, 19 Jan 2012 02:31:06 +0000 (18:31 -0800)]
Merge "Fix issues with reentrant SQLite triggers."
Romain Guy [Thu, 19 Jan 2012 02:16:10 +0000 (18:16 -0800)]
am
a37a108c: Merge "Add basic code required for drawPicture()"
* commit '
a37a108cfbaa23bcddaaeab4b838bec262bc2441':
Add basic code required for drawPicture()
Romain Guy [Thu, 19 Jan 2012 02:14:27 +0000 (18:14 -0800)]
Merge "Add basic code required for drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:12:51 +0000 (18:12 -0800)]
am
e7bdf2d9: Merge "Don\'t crash on Canvas.drawPicture()"
* commit '
e7bdf2d9d0107afadddb6498331cd21be260d23c':
Don't crash on Canvas.drawPicture()
Romain Guy [Thu, 19 Jan 2012 02:11:09 +0000 (18:11 -0800)]
Merge "Don't crash on Canvas.drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:03:23 +0000 (18:03 -0800)]
am
4785a6ff: Merge "Full support for Canvas.drawPosText"
* commit '
4785a6ff8d48f51813611f2cab998b235ce2bbca':
Full support for Canvas.drawPosText
Romain Guy [Thu, 19 Jan 2012 02:01:34 +0000 (18:01 -0800)]
Merge "Full support for Canvas.drawPosText"
Wink Saville [Thu, 19 Jan 2012 00:11:29 +0000 (16:11 -0800)]
am
170bfe32: am
7b6231a4: am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
170bfe32ab8971805d56f8870758cbc46060d1ef':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Christopher Tate [Thu, 19 Jan 2012 00:11:27 +0000 (16:11 -0800)]
am
d3f2f59c: Merge "Fix edge cases leading to backup hanging forever"
* commit '
d3f2f59c46b3979a76eae02cfb4a7071425556e1':
Fix edge cases leading to backup hanging forever
Wink Saville [Thu, 19 Jan 2012 00:08:04 +0000 (16:08 -0800)]
am
7b6231a4: am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Christopher Tate [Thu, 19 Jan 2012 00:07:28 +0000 (16:07 -0800)]
Merge "Fix edge cases leading to backup hanging forever"
Wink Saville [Thu, 19 Jan 2012 00:05:43 +0000 (16:05 -0800)]
am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Wink Saville [Thu, 19 Jan 2012 00:03:24 +0000 (16:03 -0800)]
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
Stephen Hines [Wed, 18 Jan 2012 23:44:21 +0000 (15:44 -0800)]
am
03cbb97e: Merge "Run ComputePerf multiple times."
* commit '
03cbb97e4ef89590cbcb4cb682ec0d90d601e8dd':
Run ComputePerf multiple times.
Stephen Hines [Wed, 18 Jan 2012 23:42:46 +0000 (15:42 -0800)]
Merge "Run ComputePerf multiple times."
Alex Sakhartchouk [Wed, 18 Jan 2012 22:55:11 +0000 (14:55 -0800)]
Merge "Making sure that renderpass objects get properly updated." into graphics-dev
Adam Powell [Wed, 18 Jan 2012 22:53:55 +0000 (14:53 -0800)]
am
ea77ed02: am
a6a0d134: am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
ea77ed02e44ebd177e3c7e1797d9cb804820ce43':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:51:35 +0000 (14:51 -0800)]
am
a6a0d134: am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:49:30 +0000 (14:49 -0800)]
am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:47:20 +0000 (14:47 -0800)]
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
Jeff Brown [Wed, 18 Jan 2012 22:46:08 +0000 (14:46 -0800)]
am
2a16b137: Merge "Improve heuristics for orientation detection."
* commit '
2a16b1374413abe513c0b60597262d45360138f7':
Improve heuristics for orientation detection.
Jeff Brown [Wed, 18 Jan 2012 22:43:16 +0000 (14:43 -0800)]
Merge "Improve heuristics for orientation detection."
Michael Kolb [Wed, 18 Jan 2012 22:03:09 +0000 (14:03 -0800)]
am
d9fdd9fd: Merge "Prevent IME from popping up on startup"
* commit '
d9fdd9fd7862b0d56094fa9846fb7c730ec305a8':
Prevent IME from popping up on startup
Michael Kolb [Wed, 18 Jan 2012 22:00:52 +0000 (14:00 -0800)]
Merge "Prevent IME from popping up on startup"
Robert Ly [Wed, 18 Jan 2012 21:24:45 +0000 (13:24 -0800)]
am
ca917ac1: am
c891c6ef: am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
ca917ac1e6d2cca9f3a673d8453621ddc4e6602b':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:24:42 +0000 (13:24 -0800)]
am
b41c96a3: am
43fda84e: am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
b41c96a374134c84558291fbb532fe490386a4ba':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:21:54 +0000 (13:21 -0800)]
am
c891c6ef: am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
c891c6eff7ab320092af4ec5b235f83866f66261':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:21:51 +0000 (13:21 -0800)]
am
43fda84e: am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
43fda84e91b1fe356af35386d2f304d3ab71529e':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:19:52 +0000 (13:19 -0800)]
am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:19:50 +0000 (13:19 -0800)]
am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:18:11 +0000 (13:18 -0800)]
Merge "docs: adding rs api docs" into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:17:51 +0000 (13:17 -0800)]
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
Martijn Coenen [Wed, 18 Jan 2012 21:11:44 +0000 (13:11 -0800)]
am
1ad65e70: Merge "Remove LlcpPacket from public namespace."
* commit '
1ad65e7054fa757b6c909550691d849fcb43e8b9':
Remove LlcpPacket from public namespace.
Martijn Coenen [Wed, 18 Jan 2012 21:09:55 +0000 (13:09 -0800)]
Merge "Remove LlcpPacket from public namespace."
Joe Fernandez [Wed, 18 Jan 2012 20:39:28 +0000 (12:39 -0800)]
am
5689317a: am
58f9c3da: am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
5689317a6f33e03a19359104fc2cda3ef2f20771':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:37:22 +0000 (12:37 -0800)]
am
58f9c3da: am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
58f9c3da340eb36051bc20d6b8cec6b982852ee0':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:35:30 +0000 (12:35 -0800)]
am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:33:45 +0000 (12:33 -0800)]
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Alex Sakhartchouk [Wed, 18 Jan 2012 19:43:41 +0000 (11:43 -0800)]
Merge "Fixing blur passes. Refactoring." into graphics-dev
Andreas Huber [Wed, 18 Jan 2012 19:03:14 +0000 (11:03 -0800)]
am
b2d81fea: Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
* commit '
b2d81fead90f556279d611b6f15881c663558ad5':
Temporarily restore AudioSystem/AudioTrack APIs with their former signatures
Andreas Huber [Wed, 18 Jan 2012 19:01:00 +0000 (11:01 -0800)]
Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
John Reck [Wed, 18 Jan 2012 19:00:39 +0000 (11:00 -0800)]
am
955fdda0: Add tapHighlightColor support
* commit '
955fdda057363dbf1ae95ffeb542cde8ace28b54':
Add tapHighlightColor support
Andreas Huber [Wed, 18 Jan 2012 17:32:12 +0000 (09:32 -0800)]
am
70a957ce: Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
* commit '
70a957cef141437cdf84e19c2eaeabdfb85c6542':
AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)
Andreas Huber [Wed, 18 Jan 2012 17:29:56 +0000 (09:29 -0800)]
Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
Bryan Mawhinney [Wed, 18 Jan 2012 17:00:10 +0000 (09:00 -0800)]
am
f429b6a9: Merge "Make sure seek triggers a reconnect if needed."
* commit '
f429b6a9011bd5408fb0ecba2a1f9b0167178134':
Make sure seek triggers a reconnect if needed.
Bryan Mawhinney [Wed, 18 Jan 2012 16:58:19 +0000 (08:58 -0800)]
Merge "Make sure seek triggers a reconnect if needed."
Glenn Kasten [Wed, 18 Jan 2012 15:48:32 +0000 (07:48 -0800)]
am
540c35f7: Merge "Track volume cleanup"
* commit '
540c35f7aa01f7eba849148ea8b22eff351ce16d':
Track volume cleanup
Glenn Kasten [Wed, 18 Jan 2012 15:46:18 +0000 (07:46 -0800)]
Merge "Track volume cleanup"
Jean Chalard [Wed, 18 Jan 2012 10:05:05 +0000 (02:05 -0800)]
am
96c804af: Add methods to support shortcuts in user dict.
* commit '
96c804af0b4eef79f6d3cdb0f20682e243f1b73d':
Add methods to support shortcuts in user dict.
Romain Guy [Wed, 18 Jan 2012 01:42:49 +0000 (17:42 -0800)]
am
fb9ffe02: Merge "First pass at implementing Canvas.drawPosText() in GL"
* commit '
fb9ffe02609c9c4ffca64927e72bc935cfe87768':
First pass at implementing Canvas.drawPosText() in GL
Romain Guy [Wed, 18 Jan 2012 01:40:24 +0000 (17:40 -0800)]
Merge "First pass at implementing Canvas.drawPosText() in GL"
Eric Laurent [Wed, 18 Jan 2012 01:37:25 +0000 (17:37 -0800)]
am
1be4afec: Merge "audio framework: manage stream volume per device"
* commit '
1be4afecb752559092654c0e9f4ca302b6d04e9c':
audio framework: manage stream volume per device
Romain Guy [Wed, 18 Jan 2012 01:35:06 +0000 (17:35 -0800)]
am
d33f97f1: Merge "Free optimization"
* commit '
d33f97f1965b34aae673585ad4734b536c3894ef':
Free optimization
Eric Laurent [Wed, 18 Jan 2012 01:35:03 +0000 (17:35 -0800)]
Merge "audio framework: manage stream volume per device"
Romain Guy [Wed, 18 Jan 2012 01:33:15 +0000 (17:33 -0800)]
Merge "Free optimization"
Svetoslav Ganov [Wed, 18 Jan 2012 01:27:49 +0000 (17:27 -0800)]
am
0764dee8: Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes."
* commit '
0764dee89cc82dd53196cce2865d3cabafed208f':
AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.
Svetoslav Ganov [Wed, 18 Jan 2012 01:25:56 +0000 (17:25 -0800)]
Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes."
Tadashi G. Takaoka [Wed, 18 Jan 2012 00:59:28 +0000 (16:59 -0800)]
am
fa326d1c: Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions"
* commit '
fa326d1c460dc49692bb0e6865ddb560b7270fd8':
Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions
Tadashi G. Takaoka [Wed, 18 Jan 2012 00:57:56 +0000 (16:57 -0800)]
Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions"
Teng-Hui Zhu [Tue, 17 Jan 2012 23:36:32 +0000 (15:36 -0800)]
am
48592a3d: Merge "Support javascript to exit full screen video."
* commit '
48592a3d212b64dabb4b4b6fdf52c68fc857e721':
Support javascript to exit full screen video.
Teng-Hui Zhu [Tue, 17 Jan 2012 23:35:04 +0000 (15:35 -0800)]
Merge "Support javascript to exit full screen video."
Adam Cohen [Tue, 17 Jan 2012 23:27:57 +0000 (15:27 -0800)]
am
792840d4: Merge "Hinting RemoteViewsAdapter as to which views are visible"
* commit '
792840d48a70888942df41bbf7c531b14ef14792':
Hinting RemoteViewsAdapter as to which views are visible
Adam Cohen [Tue, 17 Jan 2012 23:25:22 +0000 (15:25 -0800)]
Merge "Hinting RemoteViewsAdapter as to which views are visible"
Michael Jurka [Tue, 17 Jan 2012 23:07:03 +0000 (15:07 -0800)]
am
73d27c3d: Merge "Check if View\'s alpha must be updated in setter"
* commit '
73d27c3d46ce9a19c0cc358d0b2788f1f51706d7':
Check if View's alpha must be updated in setter
Michael Jurka [Tue, 17 Jan 2012 23:05:23 +0000 (15:05 -0800)]
Merge "Check if View's alpha must be updated in setter"
Romain Guy [Tue, 17 Jan 2012 22:56:45 +0000 (14:56 -0800)]
am
11d06a73: Merge "Fix text encoding when drawing with drawPosText in software"
* commit '
11d06a73df371be0b11d5cf586e24601d796c048':
Fix text encoding when drawing with drawPosText in software
Romain Guy [Tue, 17 Jan 2012 22:54:45 +0000 (14:54 -0800)]
Merge "Fix text encoding when drawing with drawPosText in software"
Glenn Kasten [Tue, 17 Jan 2012 22:43:34 +0000 (14:43 -0800)]
am
7c0f2824: Merge "Fix build warnings"
* commit '
7c0f2824f2f95c28b00d2581760fc7098beaa4e1':
Fix build warnings
Glenn Kasten [Tue, 17 Jan 2012 22:41:28 +0000 (14:41 -0800)]
Merge "Fix build warnings"
Glenn Kasten [Tue, 17 Jan 2012 22:12:15 +0000 (14:12 -0800)]
am
08135cbb: Merge "Remove dead setVolume() and mVolume[2]"
* commit '
08135cbbc769225b5220f385300074125a41d12f':
Remove dead setVolume() and mVolume[2]
Glenn Kasten [Tue, 17 Jan 2012 22:12:13 +0000 (14:12 -0800)]
am
3165b9b8: Merge "Move fixed_fft to system/media/audio_utils"
* commit '
3165b9b818da63538c63ae4a0453c9a2d09437ae':
Move fixed_fft to system/media/audio_utils
Glenn Kasten [Tue, 17 Jan 2012 22:10:07 +0000 (14:10 -0800)]
Merge "Remove dead setVolume() and mVolume[2]"
Glenn Kasten [Tue, 17 Jan 2012 22:09:55 +0000 (14:09 -0800)]
Merge "Move fixed_fft to system/media/audio_utils"
Siva Velusamy [Tue, 17 Jan 2012 21:48:47 +0000 (13:48 -0800)]
am
d6cc790d: Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers"
* commit '
d6cc790d145d67a0312c7216cba869b869270513':
gltrace: fixup data for glTexSubImage2D & glDeleteBuffers
Siva Velusamy [Tue, 17 Jan 2012 21:47:23 +0000 (13:47 -0800)]
Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers"
Michael Jurka [Tue, 17 Jan 2012 20:55:09 +0000 (12:55 -0800)]
am
99de98ac: Merge "Fix bug where recents stopped showing up"
* commit '
99de98ace9671c5829b308244eb7b0a6d649f644':
Fix bug where recents stopped showing up
Michael Jurka [Tue, 17 Jan 2012 20:53:48 +0000 (12:53 -0800)]
Merge "Fix bug where recents stopped showing up"
Siva Velusamy [Tue, 17 Jan 2012 20:28:11 +0000 (12:28 -0800)]
gltrace: fixup data for glTexSubImage2D & glDeleteBuffers
Change-Id: I1c1deb8c6026ecf1fa0ed5287ccf601416eba6dc
Fabrice Di Meglio [Tue, 17 Jan 2012 19:53:24 +0000 (11:53 -0800)]
am
c7c09960: Merge "Fix bug #
5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points"
* commit '
c7c09960ff9cc71d4f27f57b456986f4b634310d':
Fix bug #
5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points
Fabrice Di Meglio [Tue, 17 Jan 2012 19:51:22 +0000 (11:51 -0800)]
Merge "Fix bug #
5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points"
Glenn Kasten [Tue, 17 Jan 2012 19:36:43 +0000 (11:36 -0800)]
am
fb6b5bdc: Merge "Use audio_mode_t consistently"
* commit '
fb6b5bdcea04c1fa6ccd046373f5ad3a62784713':
Use audio_mode_t consistently
Romain Guy [Tue, 17 Jan 2012 19:34:20 +0000 (11:34 -0800)]
am
f56945e0: Merge "Improve GLES20Canvas clip support"
* commit '
f56945e06aed28041f0f370c26b4b8986033c489':
Improve GLES20Canvas clip support
Glenn Kasten [Tue, 17 Jan 2012 19:32:53 +0000 (11:32 -0800)]
Merge "Use audio_mode_t consistently"
Glenn Kasten [Tue, 17 Jan 2012 19:31:34 +0000 (11:31 -0800)]
am
2b2422dc: Merge "Rename Visualizer::mLock"
* commit '
2b2422dc4e1a8bc0467990e5d14c97efa98c4fb3':
Rename Visualizer::mLock
Romain Guy [Tue, 17 Jan 2012 19:30:22 +0000 (11:30 -0800)]
Merge "Improve GLES20Canvas clip support"
Glenn Kasten [Tue, 17 Jan 2012 19:29:01 +0000 (11:29 -0800)]
Merge "Rename Visualizer::mLock"
Gilles Debunne [Tue, 17 Jan 2012 19:15:36 +0000 (11:15 -0800)]
am
185b8256: Fixed doc typo and removed warning
* commit '
185b8256f570dfe620789130bb3861bdeecfffdd':
Fixed doc typo and removed warning
Alex Sakhartchouk [Tue, 17 Jan 2012 18:00:23 +0000 (10:00 -0800)]
Merge "Finishing light linking." into graphics-dev
Teng-Hui Zhu [Tue, 17 Jan 2012 17:07:59 +0000 (09:07 -0800)]
am
01cc1d1e: Merge "Document update for WebView user to support HTML5 video"
* commit '
01cc1d1e8c917ef2e63f0bd3ac38232d41820ad0':
Document update for WebView user to support HTML5 video
Teng-Hui Zhu [Tue, 17 Jan 2012 17:06:02 +0000 (09:06 -0800)]
Merge "Document update for WebView user to support HTML5 video"
John Reck [Tue, 17 Jan 2012 17:02:38 +0000 (09:02 -0800)]
am
c83a666f: Merge "Expand WebKitHitTest and do some preliminary caching"
* commit '
c83a666fe6f808f99a88a34f3fe00ee16ed48fd9':
Expand WebKitHitTest and do some preliminary caching
John Reck [Tue, 17 Jan 2012 17:00:49 +0000 (09:00 -0800)]
Merge "Expand WebKitHitTest and do some preliminary caching"
Glenn Kasten [Tue, 17 Jan 2012 16:57:18 +0000 (08:57 -0800)]
am
cc767191: Fix build for SDK on Mac
* commit '
cc767191cfb675f744e0165608b0a4196aba2b37':
Fix build for SDK on Mac
Glenn Kasten [Tue, 17 Jan 2012 15:49:37 +0000 (07:49 -0800)]
am
6e987a46: Check stream type in AudioFlinger::createTrack
* commit '
6e987a46f48da0cf445c0613c037dceb4f6117a4':
Check stream type in AudioFlinger::createTrack
Glenn Kasten [Tue, 17 Jan 2012 15:31:12 +0000 (07:31 -0800)]
am
c80f4078: Merge "Fix locking for mMasterVolume and mMute"
* commit '
c80f4078291877450e60400dd29a004c61b875d5':
Fix locking for mMasterVolume and mMute
Glenn Kasten [Tue, 17 Jan 2012 15:31:10 +0000 (07:31 -0800)]
am
8c17a2f0: Merge "Use size_t for frame size"
* commit '
8c17a2f0884527c3ce42a2c6dbd073014d179b53':
Use size_t for frame size
Glenn Kasten [Tue, 17 Jan 2012 15:28:14 +0000 (07:28 -0800)]
Merge "Fix locking for mMasterVolume and mMute"