diff options
| author | John Reck <jreck@google.com> | 2015-12-16 19:09:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-16 19:09:12 +0000 |
| commit | fc5151106fd3484484e3cf98254e1674dfa5be1e (patch) | |
| tree | 83b09cc2d0e86b2124c8c8a0835e44b41e31aa24 /libs/hwui/tests/macrobench/TestSceneRunner.cpp | |
| parent | 0550f1b8041e6a4ddd3447ce2db8e101d1b45b03 (diff) | |
| parent | bf4b31f7b23b0bc7a2ed4fc779aac37c9c486eb2 (diff) | |
Merge "resolve merge conflicts of 04ce46db64 to master."
Diffstat (limited to 'libs/hwui/tests/macrobench/TestSceneRunner.cpp')
0 files changed, 0 insertions, 0 deletions