OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 335e0e0 ce92141)
am ce92141c: Merge "Whitelist windows module"
authorDan Willemsen <dwillemsen@google.com>
Tue, 1 Sep 2015 16:37:04 +0000 (16:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2015 16:37:04 +0000 (16:37 +0000)
* commit 'ce92141cbdfeae302fcc1d5e4b4b261c783feaf7':
  Whitelist windows module

1  2 
opengl/libs/Android.mk patch | diff1 | diff2 | blob | history

diff --cc opengl/libs/Android.mk
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help