OSDN Git Service

Merge "allow qemu_props to set opengles.version" am: c5a33b0570
authorNick Kralevich <nnk@google.com>
Wed, 21 Oct 2015 18:24:21 +0000 (18:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Oct 2015 18:24:21 +0000 (18:24 +0000)
commit58ddb6d8e8e66e94594a26bbed9679a2bef2a6db
treecac2c77a5095be33aa92e2a52a306123d2b38832
parent4647caa9214150f892c050f0986cf9b7e71b1a46
parentc6c5b1a9692596f06a993db2d1ba810e44716cbd
Merge "allow qemu_props to set opengles.version" am: c5a33b0570
am: c6c5b1a969

* commit 'c6c5b1a9692596f06a993db2d1ba810e44716cbd':
  allow qemu_props to set opengles.version