summaryrefslogtreecommitdiffstats
path: root/opengl/tests
Commit message (Collapse)AuthorAgeFilesLines
* am 63ac8f53: am 2b2da526: Merge "Add a test application to dump all the ↵Mathias Agopian2010-10-212-0/+105
|\ | | | | | | | | | | | | | | | | EGLConfig available" into gingerbread Merge commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea' * commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea': Add a test application to dump all the EGLConfig available
| * am 2b2da526: Merge "Add a test application to dump all the EGLConfig ↵Mathias Agopian2010-10-202-0/+105
| |\ | | | | | | | | | | | | | | | | | | | | | | | | available" into gingerbread Merge commit '2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp * commit '2b2da52608303b149d22418865e67c8030c70e73': Add a test application to dump all the EGLConfig available
| | * Add a test application to dump all the EGLConfig availableMathias Agopian2010-10-202-0/+105
| | | | | | | | | | | | Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
* | | Initial checkin of a framerate test appJim Shuma2010-09-285-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Measures the time to do nothing but clear the screen in an OpenGL Java app. Spews frame time statistics to the log. Control long frame time by setting debug.longframe_ms; e.g., adb shell setprop debug.longframe_ms 33 Change-Id: I435a3cb170048349e00417c44db42121c68744b2
* | | Add simple interactive end-to-end latency test.Jack Palevich2010-09-225-0/+400
| | | | | | | | | | | | Change-Id: I4c2f2acf797a3a753f8a6061db3d2bcdc7d642f0
* | | Merge "Rework gl perf test to focus on important use cases."Jason Sams2010-09-094-254/+238
|\ \ \
| * | | Rework gl perf test to focus on important use cases.Jason Sams2010-09-084-254/+238
| | | | | | | | | | | | | | | | Change-Id: I82825dbe3b24a520b79f6b05d01f37e1b5008b62
* | | | am 45bd9946: am fec5d38b: Merge "option to enable multisampling" into ↵Mathias Agopian2010-09-091-61/+71
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c' * commit '45bd99466ce9962778eacaefff1c0a44bb268f0c': option to enable multisampling
| * | | am fec5d38b: Merge "option to enable multisampling" into gingerbreadMathias Agopian2010-09-091-61/+71
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp * commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2': option to enable multisampling
| | * | option to enable multisamplingMathias Agopian2010-09-091-61/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | multisampling can be enabled by specifying the number of samples desired on the command line. Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
* | | | am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into ↵Mathias Agopian2010-09-081-9/+18
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | gingerbread Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24' * commit '099aa9a1b4eaf6536decbcafac43476c4908ef24': add a fps counter to sanangeles demo
| * | am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbreadMathias Agopian2010-09-081-9/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp * commit 'edbb8083a815e9d911f8e659fc5c293543fdf502': add a fps counter to sanangeles demo
| | * add a fps counter to sanangeles demoMathias Agopian2010-09-081-9/+18
| | | | | | | | | | | | Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
* | | Update filltest.Jason Sams2010-07-213-602/+343
| | | | | | | | | | | | Change-Id: I37f2bde9898046eafb6431519dae78bf6f368f05
* | | Fix extraMath state variable.Jack Palevich2010-07-191-7/+11
| | | | | | | | | | | | Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
* | | Try to handle end-of-application better.Jack Palevich2010-07-191-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle rotation from portrait to landscape by restarting test if not finished. Don't write blank line to csv file. Change-Id: I154443138817bcec9530123c8388fcf659632336
* | | Write test timings to /sdcard/glperf.csvJack Palevich2010-07-192-3/+22
| | | | | | | | | | | | Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
* | | Keep screen on for whole test.Jack Palevich2010-07-192-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | Print only one set of timings per test. Draw blank black screen when done. Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
* | | An application version of the GL test.Jack Palevich2010-07-197-0/+942
| | | | | | | | | | | | Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
* | | gl perf test cleanup.Jason Sams2010-07-122-109/+5
| | | | | | | | | | | | Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
* | | Fix build.Andy McFadden2010-07-121-0/+1
| | | | | | | | | | | | | | | | | | Added missing #include <string.h>. Change-Id: Idf151876851110098fe538a042f896784821919b
* | | Remove points from fixed function.Jason Sams2010-07-093-0/+644
| | | | | | | | | | | | | | | | | | Add basic GL performance test. Change-Id: I421a41b6683b2c5f70045cdd0f610a6939105fee
* | | resolved conflicts for merge of f601ce2c to masterJean-Baptiste Queru2010-07-021-1/+0
|\ \ \ | |/ / | | | | | | Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
| * | merge from open-source masterThe Android Open Source Project2010-07-021-1/+0
| |\ \ | | |/ | |/| | | | Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
| | * Fix missing NLBruce Beare2010-06-251-1/+0
| | | | | | | | | | | | | | | Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | | am e52d66fa: am 44bea8f8: Merge changes ↵Mathias Agopian2010-06-092-2/+0
|\ \ \ | |/ / | | | | | | I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
| * | update EGL headers to the latestMathias Agopian2010-06-092-2/+0
| |/ | | | | | | | | | | note that this doesn't update the EGL stubs. Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
* | Declare that testViewport targets Froyo APIsJack Palevich2010-04-292-0/+5
| | | | | | | | (So that it can be built in Master, but run in Froyo.)
* | am 4790259c: am 8de2cf4c: merge from open-source masterThe Android Open Source Project2010-03-311-1/+2
|\ \ | |/
| * merge from open-source masterThe Android Open Source Project2010-03-311-1/+2
| |\ | | | | | | | | | Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
| | * gl_code : add end of line.Jae-Hyung Ahn2010-03-241-1/+2
| | | | | | | | | | | | Signed-off-by: Jae-Hyung Ahn <jerry.ahn@windriver.com>
| * | Add a test of EGL pausing and resuming.Jack Palevich2010-03-296-0/+274
| | |
* | | Add a test program for Sapphire viewportJack Palevich2010-03-296-0/+423
| | | | | | | | | | | | rotation issue.
* | | Add a test of EGL pausing and resuming.Jack Palevich2010-03-296-0/+274
|/ /
* | Add correct copyright headers to multiple filesKenny Root2010-03-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format for the list of changes shows the origin commit reference followed by the file name. 33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java 33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java 133776-p9 core/java/android/app/IntentService.java 127013-p9 core/java/android/appwidget/AppWidgetHost.java 27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java 60765-p9 core/java/android/content/SyncResult.java 43920-p9 core/java/android/content/pm/ActivityInfo.java 43920-p9 core/java/android/content/pm/ApplicationInfo.java 43920-p9 core/java/android/content/pm/InstrumentationInfo.java 43920-p9 core/java/android/content/pm/PackageInfo.java 44103-p9 core/java/android/content/pm/PackageItemInfo.java 68960-p9 core/java/android/content/pm/PackageStats.java 43920-p9 core/java/android/content/pm/ResolveInfo.java 43920-p9 core/java/android/content/pm/ServiceInfo.java 60641-p9 core/java/android/content/res/Configuration.java 60734-p9 core/java/android/content/res/TypedArray.java 137672-p9 core/java/android/inputmethodservice/ExtractButton.java 123112-p9 core/java/android/inputmethodservice/ExtractEditText.java 119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java 112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java 115078-p9 core/java/android/os/BatteryStats.java 124790-p9 core/java/android/text/style/UpdateAppearance.java 45083-p9 core/java/android/view/RawInputEvent.java 101491-p9 core/java/android/view/inputmethod/EditorInfo.java 114701-p9 core/java/android/view/inputmethod/ExtractedText.java 123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java 119291-p9 core/java/com/android/internal/os/HandlerCaller.java 129279-p9 core/java/com/android/internal/os/PkgUsageStats.java 114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java 114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java 84364-p9 opengl/java/android/opengl/EGLLogWrapper.java 11355-p9 opengl/tools/glgen/src/CFunc.java 11355-p9 opengl/tools/glgen/src/CType.java 11355-p9 opengl/tools/glgen/src/CodeEmitter.java 11355-p9 opengl/tools/glgen/src/GenerateGL.java 11355-p9 opengl/tools/glgen/src/JFunc.java 11355-p9 opengl/tools/glgen/src/JType.java 11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java 11355-p9 opengl/tools/glgen/src/ParameterChecker.java 57236-p9 services/java/com/android/server/status/AnimatedImageView.java 66754-p9 services/java/com/android/server/status/CloseDragHandle.java 57188-p9 services/java/com/android/server/status/DateView.java 46928-p9 services/java/com/android/server/status/ExpandedView.java 70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java 45968-p9 services/java/com/android/server/status/IconData.java 57470-p9 services/java/com/android/server/status/IconMerger.java 82719-p9 services/java/com/android/server/status/LatestItemView.java 45968-p9 services/java/com/android/server/status/NotificationData.java 66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java 57458-p9 services/java/com/android/server/status/NotificationViewList.java 45968-p9 services/java/com/android/server/status/StatusBarException.java 45968-p9 services/java/com/android/server/status/StatusBarIcon.java 46130-p9 services/java/com/android/server/status/StatusBarNotification.java 45968-p9 services/java/com/android/server/status/StatusBarView.java 46199-p9 services/java/com/android/server/status/Ticker.java 62286-p9 services/java/com/android/server/status/TickerView.java 57188-p9 services/java/com/android/server/status/TrackingView.java 86041-p9 telephony/java/android/telephony/PhoneStateListener.java 87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java 136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java 34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java 55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java 127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java 129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java 25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java 46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java 77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java 9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java 53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java 93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java 328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java 307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java 307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java 49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java 3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java 5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java 9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java 21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java 4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java 4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java 192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java 1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java 27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java 69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java Copyright header moved to top in following file: core/tests/coretests/src/android/widget/ListViewTest.java Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
* | Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-081-4/+4
| | | | | | | | Bug: #2361749.
* | Do not use a user tag on apps, as it is ignored.Jean-Baptiste Queru2010-01-063-3/+3
| | | | | | | | | | | | | | | | | | | | The build system does not honor user tags on apps, and setting it is misleading. This removes the confusion by making the makefiles behave like they read. Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885
* | Print OpenGL version and extension information.Jack Palevich2009-12-241-144/+152
| | | | | | | | | | | | Something happened to the line endings, adding a blank line after most lines of text. I repaired the damage, but in the process some blank lines have been added / removed.
* | Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich2009-11-192-217/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a new method, GLSurfaceView.setEGLContextClientVersion. Clients call this method to define which level of OpenGL ES support they want. This method only affects the default behavior of GLSurfaceView. If clients have supplied their own EGLContextFactory or EGLConfigChooser then they are on their own if they want to create an OpenGL ES 2.0 context. This API is currently hidden. Update the gl2_java test to use this new API. Update the gl2_java test's AndroidManifest.xml file to indicate that it requires OpenGL ES 2.0.
* | Add a Java API for OpenGL ES 2.0.Jack Palevich2009-11-195-0/+514
| | | | | | | | | | | | Currently this API is hidden. Add a test program.
* | am 78383abf: am cbf583d7: am 77bd91f8: Merge change Ie3e80456 into eclairMathias Agopian2009-11-011-2/+4
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e' * commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e': Turns out the SGX driver is correct and the bug was in this test.
| * \ am 77bd91f8: Merge change Ie3e80456 into eclairMathias Agopian2009-10-301-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2 * commit '77bd91f8af44867935ea2df22f69fb244b009b94': Turns out the SGX driver is correct and the bug was in this test.
| | * Turns out the SGX driver is correct and the bug was in this test.Mathias Agopian2009-10-301-2/+4
| | | | | | | | | | | | | | | make sure the 565 1-texel wide texture is specified with an alignment of 4 which is the OpenGL ES default.
* | | am 894449ac: am af7d2dda: am 5dc7a21c: Merge change I4e036287 into eclairMathias Agopian2009-10-291-11/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '894449ac461e69cd40f10e9d3644555357a5ed82' * commit '894449ac461e69cd40f10e9d3644555357a5ed82': update line test to expose some bug on SGX530 ed4
| * | am 5dc7a21c: Merge change I4e036287 into eclairMathias Agopian2009-10-291-11/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-mr2 * commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a': update line test to expose some bug on SGX530 ed4
| | * update line test to expose some bug on SGX530 ed4Mathias Agopian2009-10-291-11/+8
| | |
* | | am 2eca23d6: am a2151b2b: am 7bde36e6: added GL test for textured linesMathias Agopian2009-10-292-0/+134
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '2eca23d690379911a102729eecd35412d0c8be63' * commit '2eca23d690379911a102729eecd35412d0c8be63': added GL test for textured lines
| * | am 7bde36e6: added GL test for textured linesMathias Agopian2009-10-292-0/+134
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2 * commit '7bde36e64e66c81f0150d0372e1357a31f4ec704': added GL test for textured lines
| | * added GL test for textured linesMathias Agopian2009-10-282-0/+134
| | |
* | | am 09e7ef8a: am a5bfe52d: Merge change Ib3558f35 into eclair-mr2Jack Palevich2009-10-131-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '09e7ef8aadb480349e9f63dcab155cb466296e92' * commit '09e7ef8aadb480349e9f63dcab155cb466296e92': Make our choice of surface explicit.