tree 831c78581e2b00b5f8ca2e4bf5edf9b59bdde198
parent d35babb2a62522f785833594a7ec4c1423f830c4
parent 1964c8ed2d6b1981ee991b5ecd95ab711affdf62
author Al Sutton <al@funkyandroid.com> 1325794109 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1325794109 -0800

am 1964c8ed: am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion.

* commit '1964c8ed2d6b1981ee991b5ecd95ab711affdf62':
  Partial fix for emulator under Lion.