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)
am: ed3dac2e10

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


Trivial merge