tree 9dd955a0c48fcec6cb10a3da07ae467cbd81425d
parent b54be1a0a483760f273e2fdd86611a4f4f3fedf5
parent b8e2f0896ec6231e28db93d8900f61e8a2e43f67
author Jean-Baptiste Queru <jbq@google.com> 1334801413 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334801413 -0700

am b8e2f089: am d294027b: Merge 2fa7b9ff

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