| commit | b62f95b0fe09a85ffe5cdb663170a0b662736a5d | [log] [tgz] |
|---|---|---|
| author | Keun young Park <keunyoung@google.com> | Thu Jun 14 18:24:27 2012 -0700 |
| committer | Keun young Park <keunyoung@google.com> | Thu Jun 14 18:24:27 2012 -0700 |
| tree | a4f3d02370c5d94f3bd747b8aef6adc2b9aadc69 | |
| parent | b534ca875d510db7c4290762249b20275febd5ab [diff] | |
| parent | 03d8b3c9649bce72eec4291db4a1d6ff1de52a0a [diff] |
Resolve conflict for Merge of '03d8b3c9' - also changed some code based on the new style using CountDownLatch Conflicts: tests/expectations/knownfailures.txt tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java tests/tests/opengl/src/android/opengl/cts/RendererBase.java Change-Id: I18ea90d5c20d715587bf10f80da49fa18d1b336c