OSDN Git Service
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"
Glenn Kasten [Tue, 17 Jan 2012 15:27:46 +0000 (07:27 -0800)]
Merge "Use size_t for frame size"
Glenn Kasten [Tue, 17 Jan 2012 15:27:05 +0000 (07:27 -0800)]
am
3c6b9cca: Merge "Use audio_stream_type_t consistently"
* commit '
3c6b9cca79c872427599a325bcbb5d4a00113d80':
Use audio_stream_type_t consistently
Glenn Kasten [Tue, 17 Jan 2012 15:25:36 +0000 (07:25 -0800)]
Merge "Use audio_stream_type_t consistently"
Glenn Kasten [Tue, 17 Jan 2012 15:22:46 +0000 (07:22 -0800)]
am
a7f65620: Merge "Add android.os.Process.setThreadScheduler"
* commit '
a7f656206550dea94e51dd8c9bb2dd8734bcdf92':
Add android.os.Process.setThreadScheduler
Glenn Kasten [Tue, 17 Jan 2012 15:20:47 +0000 (07:20 -0800)]
Merge "Add android.os.Process.setThreadScheduler"
Glenn Kasten [Tue, 17 Jan 2012 15:20:35 +0000 (07:20 -0800)]
am
dd3ca2e2: Merge "AudioTrack and AudioFlinger send level cleanup"
* commit '
dd3ca2e268bc638fb57092a4e12df84cf2c5a6a9':
AudioTrack and AudioFlinger send level cleanup
Glenn Kasten [Tue, 17 Jan 2012 15:18:26 +0000 (07:18 -0800)]
Merge "AudioTrack and AudioFlinger send level cleanup"
Scott Main [Sat, 14 Jan 2012 02:30:35 +0000 (18:30 -0800)]
am
ade420df: am
2afcd2d1: am
3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '
ade420df08a40bd568df48a3b023b63aafc8e3ee':
docs: emphasize qualifier order and mention implicit version qualifer
Scott Main [Sat, 14 Jan 2012 02:28:19 +0000 (18:28 -0800)]
am
ce346e1c: am
114875e8: am
40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '
ce346e1cee8dfc9f8ba3b51745545aac78550214':
docs: mention x86 as a native platform filter
Dianne Hackborn [Sat, 14 Jan 2012 02:28:16 +0000 (18:28 -0800)]
am
dda93200: am
d4d68fe2: am
cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit '
dda932005b8a1dc202bc9aba019c7e9260341bb9':
Update notification documentation to follow current guidelines.
Daniel Sandler [Sat, 14 Jan 2012 02:28:13 +0000 (18:28 -0800)]
am
72bc7907: am
80c4cd1f: am
bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '
72bc790705f4ed9722a6a838205c69ceba6209d8':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
Scott Main [Sat, 14 Jan 2012 02:27:45 +0000 (18:27 -0800)]
am
2afcd2d1: am
3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '
2afcd2d1a29f4417425630916e1ab93aa383cf1e':
docs: emphasize qualifier order and mention implicit version qualifer
Scott Main [Sat, 14 Jan 2012 02:25:44 +0000 (18:25 -0800)]
am
3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '
3938e4fbaae132db9b4676ba26f6b3c042a6879e':
docs: emphasize qualifier order and mention implicit version qualifer
Scott Main [Sat, 14 Jan 2012 02:25:34 +0000 (18:25 -0800)]
am
114875e8: am
40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '
114875e837163e1029536439ec3891bc2582acf2':
docs: mention x86 as a native platform filter
Dianne Hackborn [Sat, 14 Jan 2012 02:25:31 +0000 (18:25 -0800)]
am
d4d68fe2: am
cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit '
d4d68fe20259e2d6aaae8bc4a38b360aa0b57081':
Update notification documentation to follow current guidelines.
Daniel Sandler [Sat, 14 Jan 2012 02:25:28 +0000 (18:25 -0800)]
am
80c4cd1f: am
bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '
80c4cd1fd7d44fcacbff7d4903ce227eb3add1e3':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
Scott Main [Sat, 14 Jan 2012 02:23:40 +0000 (18:23 -0800)]
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:23:35 +0000 (18:23 -0800)]
am
40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '
40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
Dianne Hackborn [Sat, 14 Jan 2012 02:23:34 +0000 (18:23 -0800)]
am
cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit '
cc7bd5ab550855c14c76701709b35d12a9677eb2':
Update notification documentation to follow current guidelines.
Daniel Sandler [Sat, 14 Jan 2012 02:23:33 +0000 (18:23 -0800)]
am
bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '
bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
Scott Main [Sat, 14 Jan 2012 02:21:42 +0000 (18:21 -0800)]
Merge "docs: mention x86 as a native platform filter" into ics-mr1
Irfan Sheriff [Sat, 14 Jan 2012 01:22:25 +0000 (17:22 -0800)]
am
ba8aa433: Merge "cleanup for concurrency"
* commit '
ba8aa433d5141e155eccba5640fc464228424efb':
cleanup for concurrency
Michael Kolb [Sat, 14 Jan 2012 01:22:20 +0000 (17:22 -0800)]
am
ba82e067: Merge "fix layer scrollbar updates"
* commit '
ba82e0675e2b96237941e196a8c4cf3da85864f4':
fix layer scrollbar updates
Jeff Sharkey [Sat, 14 Jan 2012 01:22:14 +0000 (17:22 -0800)]
am
438304d5: Merge "Introduce FileRotator."
* commit '
438304d515387f25ea4f9658d94aadcc12b7d415':
Introduce FileRotator.
Irfan Sheriff [Sat, 14 Jan 2012 00:41:41 +0000 (16:41 -0800)]
Merge "cleanup for concurrency"
Dianne Hackborn [Sat, 14 Jan 2012 00:36:05 +0000 (16:36 -0800)]
Merge "Update notification documentation to follow current guidelines." into ics-mr1
Michael Kolb [Sat, 14 Jan 2012 00:25:14 +0000 (16:25 -0800)]
Merge "fix layer scrollbar updates"
Jeff Sharkey [Fri, 13 Jan 2012 23:33:42 +0000 (15:33 -0800)]
Merge "Introduce FileRotator."
Jeff Brown [Fri, 13 Jan 2012 23:18:20 +0000 (15:18 -0800)]
am
4bedb481: Merge "Fix compilation with Clang."
* commit '
4bedb481036fbc6b72e5c0c620b569b508d3be16':
Fix compilation with Clang.
Jeff Brown [Fri, 13 Jan 2012 23:18:18 +0000 (15:18 -0800)]
am
dfef1994: Merge "Fix a few memory leaks in the input dispatcher."
* commit '
dfef19940f2af5c043e0c6fb49909f093b8ff96b':
Fix a few memory leaks in the input dispatcher.
Jeff Brown [Fri, 13 Jan 2012 23:16:59 +0000 (15:16 -0800)]
Merge "Fix compilation with Clang."
Jeff Brown [Fri, 13 Jan 2012 23:16:28 +0000 (15:16 -0800)]
Merge "Fix a few memory leaks in the input dispatcher."
Gilles Debunne [Fri, 13 Jan 2012 22:56:43 +0000 (14:56 -0800)]
am
893eace6: Merge "Sub display list in TextView"
* commit '
893eace60992a640064b454d7ad477c1bbffcb1d':
Sub display list in TextView
Gilles Debunne [Fri, 13 Jan 2012 22:53:54 +0000 (14:53 -0800)]
Merge "Sub display list in TextView"
David 'Digit' Turner [Fri, 13 Jan 2012 22:34:21 +0000 (14:34 -0800)]
am
d615f34b: Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
* commit '
d615f34b565bce98e202397240448845b934e596':
media/mtp: Add missing LOCAL_C_INCLUDES
David 'Digit' Turner [Fri, 13 Jan 2012 22:32:50 +0000 (14:32 -0800)]
Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
Stephen Hines [Fri, 13 Jan 2012 22:16:39 +0000 (14:16 -0800)]
am
d36f7d24: Merge "Add support for new root.expand() calls."
* commit '
d36f7d249591559e713a8ca45c6d452c14c94895':
Add support for new root.expand() calls.
Glenn Kasten [Fri, 13 Jan 2012 22:16:35 +0000 (14:16 -0800)]
am
1e808691: Get AID_GRAPHICS from right place
* commit '
1e80869133924e1ffff5c10ca787da303fd0b53d':
Get AID_GRAPHICS from right place
Kenny Root [Fri, 13 Jan 2012 22:16:21 +0000 (14:16 -0800)]
am
fcbbaf1d: resolved conflicts for merge of
e80341c8 to master
* commit '
fcbbaf1d837e96e77d0ec45a050e8a41060ae7f3':
Fix issue with selecting proper JNI libraries
Dianne Hackborn [Fri, 13 Jan 2012 22:16:14 +0000 (14:16 -0800)]
am
f88d1493: am
10065177: am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
f88d1493aa968d3da551116f076edd5e21f7ccfc':
Fix issue #
5823276: home repaints after full-screen app is exited
Jason Sams [Fri, 13 Jan 2012 22:02:26 +0000 (14:02 -0800)]
Merge "Start implementing SurfaceTexture streaming into RS allocations." into graphics-dev
Stephen Hines [Fri, 13 Jan 2012 21:57:24 +0000 (13:57 -0800)]
Merge "Add support for new root.expand() calls."
Glenn Kasten [Mon, 19 Dec 2011 21:55:34 +0000 (13:55 -0800)]
Get AID_GRAPHICS from right place
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
Kenny Root [Fri, 13 Jan 2012 21:39:28 +0000 (13:39 -0800)]
resolved conflicts for merge of
e80341c8 to master
Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
Kenny Root [Fri, 13 Jan 2012 21:12:34 +0000 (13:12 -0800)]
am
2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '
2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
Kenny Root [Fri, 13 Jan 2012 21:11:02 +0000 (13:11 -0800)]
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
Dianne Hackborn [Fri, 13 Jan 2012 21:01:48 +0000 (13:01 -0800)]
am
10065177: am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
100651779fde99f7ae2a10719d688b51115f08e9':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:58:45 +0000 (12:58 -0800)]
am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
2e282f35b009fe4c23daca35592dae2032641643':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:56:40 +0000 (12:56 -0800)]
Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Bart Sears [Fri, 13 Jan 2012 20:41:10 +0000 (12:41 -0800)]
am
31cef145: am
bcce2a19: am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
31cef1451e84e613825a78716f4b8cedd5ae9084':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:37:53 +0000 (12:37 -0800)]
am
bcce2a19: am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
bcce2a195390c3f5fc235c3fa551d3d725a7f88a':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:35:07 +0000 (12:35 -0800)]
am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:32:43 +0000 (12:32 -0800)]
Merge "Update to latest version of Roboto" into ics-mr1
Christopher Tate [Fri, 13 Jan 2012 20:21:17 +0000 (12:21 -0800)]
am
ecce05fa: am
89620c5d: am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
ecce05fac6600d01b5dca1cbf6345837e2840c5a':
Streamline package-installed handling by the Backup Manager
Christopher Tate [Fri, 13 Jan 2012 20:18:55 +0000 (12:18 -0800)]
am
89620c5d: am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
89620c5d982858f590f3740169c9f69ee380be3e':
Streamline package-installed handling by the Backup Manager
Romain Guy [Fri, 13 Jan 2012 20:15:59 +0000 (12:15 -0800)]
am
60c6b082: Merge "Remove unused parameter"
* commit '
60c6b082eaa534402911adb2a5e76618e6e0e49d':
Remove unused parameter
Romain Guy [Fri, 13 Jan 2012 20:13:52 +0000 (12:13 -0800)]
Merge "Remove unused parameter"
Christopher Tate [Fri, 13 Jan 2012 20:08:09 +0000 (12:08 -0800)]
am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
Christopher Tate [Fri, 13 Jan 2012 19:49:20 +0000 (11:49 -0800)]
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
John Huang [Fri, 13 Jan 2012 19:43:28 +0000 (11:43 -0800)]
am
70f52e6d: am
e6572304: am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
70f52e6d795f1cd4d23efcbdc2b9e2f9d0c22eb6':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:41:01 +0000 (11:41 -0800)]
am
e6572304: am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:39:03 +0000 (11:39 -0800)]
am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:37:15 +0000 (11:37 -0800)]
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:30:21 +0000 (11:30 -0800)]
am
134a6835: am
c0ef548c: am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
134a68356534951f5a6792e30f61db518c6b6ad8':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:28:09 +0000 (11:28 -0800)]
am
c0ef548c: am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:25:09 +0000 (11:25 -0800)]
am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
d75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Robert Ly [Fri, 13 Jan 2012 19:24:43 +0000 (11:24 -0800)]
am
3e9aa56e: am
7da0abc5: am
62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '
3e9aa56e563ac5a876bb23c0377ccd4698709630':
cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:22:08 +0000 (11:22 -0800)]
am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
OSDN Git Service
