tree 2e25538df341f6c56c221e5469f20e71dee1d4bc
parent 48a3df3d0986e8bbbc21a498e2173df12288766f
parent 6d82fa64b7c849d1e7a4585355c3ba30547761fc
author Yiwei Zhang <zzyiwei@google.com> 1541146892 -0700
committer android-build-merger <android-build-merger@google.com> 1541146892 -0700

Merge "EGL: add a missing native_window_api_disconnect" am: c8fb8bd760
am: 6d82fa64b7

Change-Id: Iba5ffa6f42bdb2d33be67edae1b7d9bde75d266e