OSDN Git Service

am 905dc8b7: am ce92141c: Merge "Whitelist windows module"
authorDan Willemsen <dwillemsen@google.com>
Tue, 1 Sep 2015 16:49:45 +0000 (16:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2015 16:49:45 +0000 (16:49 +0000)
commitfe54df2ad3244d1cb745a6aac868654f0fc05315
treebadfd7e7a55be2b1848996f1140598336c606198
parent4b69cbd6e95da7a209f839804e0fef7494a15459
parent905dc8b76a98268a8047358ac55e14b4db18de8b
am 905dc8b7: am ce92141c: Merge "Whitelist windows module"

* commit '905dc8b76a98268a8047358ac55e14b4db18de8b':
  Whitelist windows module
opengl/libs/Android.mk