tree 7fe8f2cf8cb20840dbb1ee5557a87ae977b74f1c
parent ef9adb4a37fe99566b4d528ea172aa10b08671b3
parent c22537fdf4bedb53daf10122ede32e718b9402b3
author Xavier Ducrohet <xav@google.com> 1403900407 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403900407 +0000

am c22537fd: Merge "Fix packaging of emulator hardware ini file." into idea133 automerge: 1f2b8d2

* commit 'c22537fdf4bedb53daf10122ede32e718b9402b3':
  Fix packaging of emulator hardware ini file.