Merge "Add missing getPlatformAttributes() method to X11 EGL platform." into nyc-dev
authorMika Isojarvi <misojarvi@google.com>
Fri, 19 Feb 2016 21:02:59 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Feb 2016 21:02:59 +0000 (21:02 +0000)
commit894233b35fc7f7a9ff428187906c076fac757b17
tree52d97f8e28856538b521bf9c0c1edd2276dcb5b4
parent830acb175dae8f3aaacffa7a6e4289c5d5db7fc3
parented3dac2e10f5b3f4174cc03004fe97551ebb2375
Merge "Add missing getPlatformAttributes() method to X11 EGL platform." into nyc-dev
am: ed3dac2e10

* commit 'ed3dac2e10f5b3f4174cc03004fe97551ebb2375':
  Add missing getPlatformAttributes() method to X11 EGL platform.