summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-09-17 02:54:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-17 02:54:35 +0000
commit569b32aae264d045a20bc7884bde3aef4c9cb277 (patch)
tree6fc739204474cf174848b309d162a46fe24c0059 /opengl/tests/gl_basic/gl_basic.cpp
parentff12cba77b5b88f3978070bb970d7721225271ee (diff)
parentf1fa40ba1901e5486663ff2898d2ac0a3ee899e5 (diff)
am f1fa40ba: am 6f3c7877: am da5b88ad: am d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit 'f1fa40ba1901e5486663ff2898d2ac0a3ee899e5': Installd: Allow different behavior before bootcomplete
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions