OSDN Git Service

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)
commit4aebfc420a1799fe60ee55537b6a7a3e5cc96b2a
tree1a8644df43f9d8de8956681ab3613a0c57abc398
parent8c4afe8735e0bb4b7d94989f6fb4e6019f02e4a5
parent321ce5f82079bc2ea80586bd5abc8250bc296ae0
am 321ce5f8: Merge "resolved conflicts for merge of 6da54b6e to master"

* commit '321ce5f82079bc2ea80586bd5abc8250bc296ae0':
  emulator: Enable GLES emulation libraries