OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c4afe8 321ce5f)
am 321ce5f8: Merge "resolved conflicts for merge of 6da54b6e to master"
authorDavid 'Digit' Turner <digit@google.com>
Mon, 29 Aug 2011 22:15:19 +0000 (15:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Aug 2011 22:15:19 +0000 (15:15 -0700)
* commit '321ce5f82079bc2ea80586bd5abc8250bc296ae0':
  emulator: Enable GLES emulation libraries


Trivial merge
build
About OSDN
Find Software
Develop Software
Help