tree fc02b6ec80e3ff5eccc18eaf88619d977d918a4a
parent feb433d381ecf053276e1d93119b230cce6decbb
parent d294027b1f6a904f407d85169a1d47458274bd4d
author Jean-Baptiste Queru <jbq@google.com> 1334801280 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334801280 -0700

am d294027b: Merge 2fa7b9ff

* commit 'd294027b1f6a904f407d85169a1d47458274bd4d':
  Move emulator GLES from development.git to sdk.git