diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-07-07 02:52:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-07 02:52:47 +0000 |
| commit | f5d412923c1f458b7af054f8e3bab3b7efba4628 (patch) | |
| tree | a02ec36cdad28aed90ef45e4a182ecab7c17d42f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e48ecd63e0d19356936fd6a8516d826c39486034 (diff) | |
| parent | da075a96815ea82ef9e9948f3248bf7a0b6ba833 (diff) | |
Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am: da075a9681
Change-Id: I131d809cbe0405849193245cb82df643512a2d16
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions