diff options
author | Amith Yamasani <yamasani@google.com> | 2013-09-17 08:58:55 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 08:58:55 -0700 |
commit | 3e08bb7668c7d57925e393f5d27db59c10ba07eb (patch) | |
tree | 97d85984dee6917a8a9af70fc8bff73dac56f2e5 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | b8080d9a3b760617c5dde7b1d2d63aa2bcecf3a7 (diff) | |
parent | fc7083a828b6db00698c1418e5f370b31625213c (diff) |
am fc7083a8: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
* commit 'fc7083a828b6db00698c1418e5f370b31625213c':
Enable FEATURE_DEVICE_ADMIN for handheld devices
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions