tree d0da0228c85eb47bb19691d5a081a68697aa460d
parent 8066f12a07b050809c62fda1bdae5296e81a4c11
parent 75094ee1ac5fff3ef155a1745ec3c1a14d8c4b10
author David Turner <digit@android.com> 1313505329 -0700
committer Android Code Review <code-review@android.com> 1313505329 -0700

Merge "opengles emulator: use bionic tls slot"