OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e55073a d6fce7a)
am d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
authorMichael Lentine <mlentine@google.com>
Wed, 28 Jan 2015 22:38:42 +0000 (22:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Jan 2015 22:38:42 +0000 (22:38 +0000)
* commit 'd6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8':
  Remove lock around ref count check in terminate.

1  2 
opengl/libs/EGL/egl_display.h patch | diff1 | diff2 | blob | history

diff --cc opengl/libs/EGL/egl_display.h
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help