diff options
| author | Eric Fischer <enf@google.com> | 2012-06-05 09:21:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 09:21:13 -0700 |
| commit | 321f8230a98b8b425b6b936bc69b49ec9aeab4af (patch) | |
| tree | c2262f1f9b80ea53a49b3f3ca578196a35fe9e4d /tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestController.java | |
| parent | a6bd681304b26f8063efdd7b379dcfd22e4ec427 (diff) | |
| parent | 2c36609d908869ea776bc1c0627851fab1e490c5 (diff) | |
am 2c36609d: (-s ours) am bbdf46d8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '2c36609d908869ea776bc1c0627851fab1e490c5':
Import translations. DO NOT MERGE
Diffstat (limited to 'tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestController.java')
0 files changed, 0 insertions, 0 deletions