OSDN Git Service
Glenn Kasten [Wed, 8 Feb 2012 15:47:29 +0000 (07:47 -0800)]
am
22776652: Merge "Improve performance for sp<> on stack"
* commit '
2277665266780eae75d6c25df4826bffbffa00cc':
Improve performance for sp<> on stack
Glenn Kasten [Wed, 8 Feb 2012 15:45:22 +0000 (07:45 -0800)]
am
09b9ba0d: Merge "AudioTrack declare more methods const"
* commit '
09b9ba0db29aaebe682b7391d93ae179b8bd8ee8':
AudioTrack declare more methods const
Glenn Kasten [Wed, 8 Feb 2012 15:45:20 +0000 (07:45 -0800)]
am
01a80269: Merge "Use 0 not NULL for sp<> and wp<>"
* commit '
01a802692f6bf2c97a623683d073e949af61d7a9':
Use 0 not NULL for sp<> and wp<>
Glenn Kasten [Wed, 8 Feb 2012 15:45:15 +0000 (07:45 -0800)]
Merge "Improve performance for sp<> on stack"
Glenn Kasten [Wed, 8 Feb 2012 15:43:05 +0000 (07:43 -0800)]
am
35624c17: Merge "Use bool instead of int"
* commit '
35624c17973a941fe000026d899f065c1155021b':
Use bool instead of int
Glenn Kasten [Wed, 8 Feb 2012 15:42:40 +0000 (07:42 -0800)]
Merge "AudioTrack declare more methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:41:44 +0000 (07:41 -0800)]
Merge "Use 0 not NULL for sp<> and wp<>"
Glenn Kasten [Wed, 8 Feb 2012 15:40:57 +0000 (07:40 -0800)]
am
16d64ad6: Merge "Declare more IAudioFlinger methods const"
* commit '
16d64ad699b2dc91d5e1f149a3de645cf83ec965':
Declare more IAudioFlinger methods const
Glenn Kasten [Wed, 8 Feb 2012 15:40:54 +0000 (07:40 -0800)]
am
e0efd5f6: Merge "Remove dead code"
* commit '
e0efd5f6c19e8944e5dd65e8c537fcb32b1b9fd2':
Remove dead code
Glenn Kasten [Wed, 8 Feb 2012 15:40:23 +0000 (07:40 -0800)]
Merge "Use bool instead of int"
Glenn Kasten [Wed, 8 Feb 2012 15:39:27 +0000 (07:39 -0800)]
Merge "Declare more IAudioFlinger methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:38:42 +0000 (07:38 -0800)]
Merge "Remove dead code"
Scott Main [Wed, 8 Feb 2012 05:54:18 +0000 (21:54 -0800)]
Scott Main [Wed, 8 Feb 2012 05:54:15 +0000 (21:54 -0800)]
am
a5bbd3b3: am
f8274e50: am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
a5bbd3b348a72f6a64445defdbb29c36fb2b62d9':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:52:27 +0000 (21:52 -0800)]
Scott Main [Wed, 8 Feb 2012 05:52:24 +0000 (21:52 -0800)]
am
f8274e50: am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
f8274e506c1e4ef798554244370daf57cc88ecdb':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:50:20 +0000 (21:50 -0800)]
Scott Main [Wed, 8 Feb 2012 05:49:37 +0000 (21:49 -0800)]
am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:48:03 +0000 (21:48 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:47:38 +0000 (21:47 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Guang Zhu [Wed, 8 Feb 2012 03:43:19 +0000 (19:43 -0800)]
am
1c4ea6a2: Merge "Revert "Make NDC not block forever and handle restart.""
* commit '
1c4ea6a26c32a0a6f6b41966dabcc8d7f106ad85':
Revert "Make NDC not block forever and handle restart."
Romain Guy [Wed, 8 Feb 2012 03:43:15 +0000 (19:43 -0800)]
am
bc52cce2: Better error message when drawing with recycled bitmaps
* commit '
bc52cce276b6238e8f30f71a0dcf24209481261e':
Better error message when drawing with recycled bitmaps
Guang Zhu [Wed, 8 Feb 2012 03:42:07 +0000 (19:42 -0800)]
Merge "Revert "Make NDC not block forever and handle restart.""
Jason Sams [Wed, 8 Feb 2012 02:58:19 +0000 (18:58 -0800)]
am
5b6abb38: Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
* commit '
5b6abb38f0892f429976bd6976f93ae216b21d38':
Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream.
Jason Sams [Wed, 8 Feb 2012 02:56:39 +0000 (18:56 -0800)]
Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
Romain Guy [Wed, 8 Feb 2012 02:24:53 +0000 (18:24 -0800)]
am
28587f44: Merge "Fix the system"
* commit '
28587f445a2af6d94d1b215e019e8bcc377c17a1':
Fix the system
Romain Guy [Wed, 8 Feb 2012 02:22:43 +0000 (18:22 -0800)]
Merge "Fix the system"
Fabrice Di Meglio [Wed, 8 Feb 2012 01:51:42 +0000 (17:51 -0800)]
am
ed219c11: Merge "Fix bug #
5979311 Change TextView to not clip top/bottom text"
* commit '
ed219c117d449304bd720fc7d7da1f361015dc58':
Fix bug #
5979311 Change TextView to not clip top/bottom text
Fabrice Di Meglio [Wed, 8 Feb 2012 01:49:47 +0000 (17:49 -0800)]
Merge "Fix bug #
5979311 Change TextView to not clip top/bottom text"
Romain Guy [Wed, 8 Feb 2012 01:09:08 +0000 (17:09 -0800)]
am
68c02e25: Merge "Preliminary support for clipRect(Rect, Op)"
* commit '
68c02e25e84e9814d313b43680631b98e25fa6d5':
Preliminary support for clipRect(Rect, Op)
Romain Guy [Wed, 8 Feb 2012 01:07:00 +0000 (17:07 -0800)]
Merge "Preliminary support for clipRect(Rect, Op)"
Romain Guy [Wed, 8 Feb 2012 01:04:34 +0000 (17:04 -0800)]
Preliminary support for clipRect(Rect, Op)
This adds basic support for clip regions. It is currently disabled at compile
time. Enabling clip regions will require setting up a stencil buffer.
Change-Id: I638616a972276e38737f8ac0633692c3845eaa74
Robert Greenwalt [Wed, 8 Feb 2012 00:43:34 +0000 (16:43 -0800)]
am
ec159352: Merge "Make NDC not block forever and handle restart."
* commit '
ec159352fe7fb4c6a476c3542dc65037cb57f982':
Make NDC not block forever and handle restart.
Wink Saville [Wed, 8 Feb 2012 00:43:30 +0000 (16:43 -0800)]
am
28900a7b: Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
* commit '
28900a7b36c372b953648a6ce4c8858de25e9197':
Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful.
Jeff Sharkey [Wed, 8 Feb 2012 00:43:27 +0000 (16:43 -0800)]
am
b5718c29: Merge "Send broadcast when changing restrict background."
* commit '
b5718c29aece51dd337e719c5b94be867833d53e':
Send broadcast when changing restrict background.
Jason Sams [Wed, 8 Feb 2012 00:42:03 +0000 (16:42 -0800)]
Merge "Merge commit '
bdeec118' into manualmerge" into graphics-dev
Jason Sams [Wed, 8 Feb 2012 00:40:51 +0000 (16:40 -0800)]
Merge commit '
bdeec118' into manualmerge
Conflicts:
libs/rs/rsThreadIO.h
Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2
Robert Greenwalt [Wed, 8 Feb 2012 00:19:56 +0000 (16:19 -0800)]
Merge "Make NDC not block forever and handle restart."
Wink Saville [Tue, 7 Feb 2012 23:56:23 +0000 (15:56 -0800)]
Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
Jeff Sharkey [Tue, 7 Feb 2012 23:50:02 +0000 (15:50 -0800)]
Merge "Send broadcast when changing restrict background."
Jason Sams [Tue, 7 Feb 2012 23:39:44 +0000 (15:39 -0800)]
Merge "Implement RS VSync on new vsync infrastructure."
Simon Wilson [Tue, 7 Feb 2012 23:01:02 +0000 (15:01 -0800)]
am
c92e6f14: AccessoryChat: use platform APIs and support Galaxy Nexus
* commit '
c92e6f14f9ac6c86b7784f8a21d7077ea7cae0bb':
AccessoryChat: use platform APIs and support Galaxy Nexus
Dianne Hackborn [Tue, 7 Feb 2012 21:48:38 +0000 (13:48 -0800)]
am
dc210ade: Merge "Return information about whether overlays are disabled."
* commit '
dc210ade0ad4770c5294320453f8ddfbfcbaf943':
Return information about whether overlays are disabled.
Dianne Hackborn [Tue, 7 Feb 2012 21:48:35 +0000 (13:48 -0800)]
am
424a69d5: Merge "Only generate private symbols that are needed."
* commit '
424a69d502db85ffaecf9cad00321b677616a9c5':
Only generate private symbols that are needed.
Dianne Hackborn [Tue, 7 Feb 2012 21:46:46 +0000 (13:46 -0800)]
Merge "Return information about whether overlays are disabled."
Dianne Hackborn [Tue, 7 Feb 2012 21:46:28 +0000 (13:46 -0800)]
Merge "Only generate private symbols that are needed."
Svetoslav Ganov [Tue, 7 Feb 2012 20:09:28 +0000 (12:09 -0800)]
am
d36ad9b1: Merge "Adding a method for retching the root node in UiTestAutomationBridge"
* commit '
d36ad9b1ff99675dd0eca6a3fda1f52353f451a4':
Adding a method for retching the root node in UiTestAutomationBridge
Svetoslav Ganov [Tue, 7 Feb 2012 20:07:23 +0000 (12:07 -0800)]
Merge "Adding a method for retching the root node in UiTestAutomationBridge"
Jeff Sharkey [Tue, 7 Feb 2012 18:47:22 +0000 (10:47 -0800)]
am
e7171eff: Merge "List rotated netstats files during --checkin dump."
* commit '
e7171effdf9ef0700782520187c0a292b0a74759':
List rotated netstats files during --checkin dump.
Jeff Sharkey [Tue, 7 Feb 2012 18:45:41 +0000 (10:45 -0800)]
Merge "List rotated netstats files during --checkin dump."
Andreas Huber [Tue, 7 Feb 2012 18:45:06 +0000 (10:45 -0800)]
am
8320e70f: Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
* commit '
8320e70fbee26dc72a23aaad498f57e2252cc7c8':
MatroskaExtractor: to support MPEG4 and MP3 codec.
Andreas Huber [Tue, 7 Feb 2012 18:43:08 +0000 (10:43 -0800)]
Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
The Android Open Source Project [Tue, 7 Feb 2012 18:25:11 +0000 (10:25 -0800)]
The Android Open Source Project [Tue, 7 Feb 2012 18:23:12 +0000 (10:23 -0800)]
The Android Open Source Project [Tue, 7 Feb 2012 18:21:31 +0000 (10:21 -0800)]
am
1bd8111b: Reconcile with ics-mr1-release
* commit '
1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
The Android Open Source Project [Tue, 7 Feb 2012 18:18:32 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
The Android Open Source Project [Tue, 7 Feb 2012 18:15:33 +0000 (10:15 -0800)]
am
067af269: am
01383571: am
07bebe8b: Reconcile with ics-mr1-release
* commit '
067af269edf76260e1b0b07ea46896299d5f01ec':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:12:59 +0000 (10:12 -0800)]
am
01383571: am
07bebe8b: Reconcile with ics-mr1-release
* commit '
0138357198244b5bda242e248ed98040622ea5af':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:11:11 +0000 (10:11 -0800)]
am
07bebe8b: Reconcile with ics-mr1-release
* commit '
07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:09:07 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
Marco Nelissen [Tue, 7 Feb 2012 16:30:22 +0000 (08:30 -0800)]
am
f047c14f: Merge "Make media scanner use new delete-parameter"
* commit '
f047c14f23abd94b3fb04f56dded13b66236ca53':
Make media scanner use new delete-parameter
Marco Nelissen [Tue, 7 Feb 2012 16:28:02 +0000 (08:28 -0800)]
Merge "Make media scanner use new delete-parameter"
Dianne Hackborn [Tue, 7 Feb 2012 05:21:05 +0000 (21:21 -0800)]
Return information about whether overlays are disabled.
Change-Id: I85ae42e9f28461f5142cc6b3c8e25ff3f195805a
Chih-Chung Chang [Tue, 7 Feb 2012 05:13:42 +0000 (21:13 -0800)]
am
fb2cfa22: Comment out a warning message to avoid log spamming.
* commit '
fb2cfa223b47db3ee46df22dcdb92f4fb013dcdd':
Comment out a warning message to avoid log spamming.
Mathias Agopian [Tue, 7 Feb 2012 03:20:42 +0000 (19:20 -0800)]
am
f0533365: Merge "make sure to ignore SIGPIPE in the write side of BitTube"
* commit '
f0533365dc1c89253a551a77fbc987568bb8e650':
make sure to ignore SIGPIPE in the write side of BitTube
Mathias Agopian [Tue, 7 Feb 2012 03:18:57 +0000 (19:18 -0800)]
Merge "make sure to ignore SIGPIPE in the write side of BitTube"
Mathias Agopian [Tue, 7 Feb 2012 03:10:04 +0000 (19:10 -0800)]
make sure to ignore SIGPIPE in the write side of BitTube
Change-Id: If4f037f4403d3ecbcd5f91248354765fc0fa13cb
Alex Sakhartchouk [Tue, 7 Feb 2012 03:16:33 +0000 (19:16 -0800)]
Merge "Streamlining texture creation. Adding render target textureas. Adding texture params for shaders. Making it easier to bind root script." into graphics-dev
Alex Sakhartchouk [Tue, 7 Feb 2012 03:15:20 +0000 (19:15 -0800)]
Merge "Fixes to simplify programmatic creation." into graphics-dev
Xavier Ducrohet [Tue, 7 Feb 2012 02:09:43 +0000 (18:09 -0800)]
am
0c34c14a: Merge "Fix a setBackgroundDrawable in layoutlib."
* commit '
0c34c14a17af0e90086f674f6a4d510673e250c8':
Fix a setBackgroundDrawable in layoutlib.
Xavier Ducrohet [Tue, 7 Feb 2012 02:07:21 +0000 (18:07 -0800)]
Merge "Fix a setBackgroundDrawable in layoutlib."
Fabrice Di Meglio [Tue, 7 Feb 2012 01:25:20 +0000 (17:25 -0800)]
am
61241256: Merge "Fix bug #
5968466 system running out of memory during WebView performance test"
* commit '
61241256985d72cd4ff7673eea275aacb82d6cf9':
Fix bug #
5968466 system running out of memory during WebView performance test
Fabrice Di Meglio [Tue, 7 Feb 2012 01:23:13 +0000 (17:23 -0800)]
am
f531a800: Merge "Update BiDiTest app for adding GridLayout unit tests"
* commit '
f531a800754d6af5c04ee50f15db1ceb00897bb1':
Update BiDiTest app for adding GridLayout unit tests
Fabrice Di Meglio [Tue, 7 Feb 2012 01:22:06 +0000 (17:22 -0800)]
Merge "Fix bug #
5968466 system running out of memory during WebView performance test"
Fabrice Di Meglio [Tue, 7 Feb 2012 01:21:40 +0000 (17:21 -0800)]
Merge "Update BiDiTest app for adding GridLayout unit tests"
John Wang [Tue, 7 Feb 2012 01:09:35 +0000 (17:09 -0800)]
am
c70969ea: am
a0da8adf: am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
c70969ea5cf8021635be1fdb5074e4fb3cb928f0':
John Wang [Tue, 7 Feb 2012 01:09:33 +0000 (17:09 -0800)]
am
17cbdd39: am
7e6295b3: am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
17cbdd39ea0319ca2d50ab6ee4b5733312417ec6':
Don't use SNR in the invalid check.
Craig Mautner [Tue, 7 Feb 2012 01:07:27 +0000 (17:07 -0800)]
am
a52b6e7b: Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
* commit '
a52b6e7bcf5ee6e80a4443f19b31a3df0ec4e518':
Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods.
John Wang [Tue, 7 Feb 2012 01:06:18 +0000 (17:06 -0800)]
am
a0da8adf: am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':
John Wang [Tue, 7 Feb 2012 01:06:16 +0000 (17:06 -0800)]
am
7e6295b3: am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
7e6295b32310afddccf5fb030d4c475ed3678e0f':
Don't use SNR in the invalid check.
Tom Taylor [Tue, 7 Feb 2012 01:05:16 +0000 (17:05 -0800)]
am
429cf48e: Merge "CrespoMMS appears after delay in the thread"
* commit '
429cf48e2c777cc72925955d7943091b3cf3e181':
CrespoMMS appears after delay in the thread
John Wang [Tue, 7 Feb 2012 01:04:42 +0000 (17:04 -0800)]
am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
397d3ffcbd27d10b9479e58a46ca6ba70838b697':
Craig Mautner [Tue, 7 Feb 2012 01:04:23 +0000 (17:04 -0800)]
Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
John Wang [Tue, 7 Feb 2012 01:04:11 +0000 (17:04 -0800)]
am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
Don't use SNR in the invalid check.
Tom Taylor [Tue, 7 Feb 2012 01:03:34 +0000 (17:03 -0800)]
Merge "CrespoMMS appears after delay in the thread"
John Wang [Tue, 7 Feb 2012 01:03:15 +0000 (17:03 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:02:30 +0000 (17:02 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:00:49 +0000 (17:00 -0800)]
Merge "Don't use SNR in the invalid check." into ics-mr1
Xavier Ducrohet [Tue, 7 Feb 2012 00:51:04 +0000 (16:51 -0800)]
am
0a599632: am
82a74bbe: (-s ours) am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
0a59963287f6a54eaf7ff5110474b02713502f9a':
Xavier Ducrohet [Tue, 7 Feb 2012 00:48:55 +0000 (16:48 -0800)]
am
82a74bbe: (-s ours) am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':
Xavier Ducrohet [Tue, 7 Feb 2012 00:48:48 +0000 (16:48 -0800)]
am
e1ce916e: am
c9bcd33a: (-s ours) am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
e1ce916e0029d72ddbf7476efd4993c7301ec784':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:46:46 +0000 (16:46 -0800)]
am
c9bcd33a: (-s ours) am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:45:21 +0000 (16:45 -0800)]
am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
82fc005f579a20b3c7e63603f056ca095c288196':
Xavier Ducrohet [Tue, 7 Feb 2012 00:44:32 +0000 (16:44 -0800)]
am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
b1f95c6a938f6eaaa7a3fd28574a14647178059b':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:56 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:41 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
James Dong [Tue, 7 Feb 2012 00:23:12 +0000 (16:23 -0800)]
am
c10cd4a6: Merge "Don\'t call virtual function in destructor of SurfaceMediaSource"
* commit '
c10cd4a6e3021010786c1dbd69ab4e03ecb689e6':
Don't call virtual function in destructor of SurfaceMediaSource
James Dong [Tue, 7 Feb 2012 00:21:24 +0000 (16:21 -0800)]
Merge "Don't call virtual function in destructor of SurfaceMediaSource"
Xavier Ducrohet [Tue, 7 Feb 2012 00:19:08 +0000 (16:19 -0800)]
am
327c8c2f: Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."
* commit '
327c8c2fbcfa954b2216de5d627447bec2cd4ea8':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:17:42 +0000 (16:17 -0800)]
Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."