tree d1b830242840c4ab7c52467fb92dadb84e169dc6
parent 17d28f805e7e918d1f9ddc97d1f3b9c6b0efe003
parent 2ae1c269a7984c72932e1797faad58587967ecdf
author David Turner <digit@android.com> 1390542681 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390542681 +0000

am 2ae1c269: am 146cce0e: am cdecaca3: am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"

* commit '2ae1c269a7984c72932e1797faad58587967ecdf':
  Vibra: emulator: compile and stage vibrator.goldfish