tree df7f6ae2c852ec0a63869fe3a05a76aea69b69bd
parent 06f2189a4eb7221ae5ef0eda451f4f7875b906b5
parent 85d6342d8b5e76f933a200c8a9832a52b69d9548
author David Turner <digit@android.com> 1301323280 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301323280 -0700

am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator."

* commit '85d6342d8b5e76f933a200c8a9832a52b69d9548':
  Enable lcd backlight in the emulator.