tree c42229a7ae0f2fa7981f8a2fcedff9bbc0272e9f
parent 9c525d8826ee39a9b5fca7fdc831aa49b6d60e65
parent dd848041237b660bad38e6567cbfc0c0c5161c24
author Piotr Gurgul <pgurgul@google.com> 1252613447 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252613447 -0700

am dd848041: Merge change 24481 into eclair

Merge commit 'dd848041237b660bad38e6567cbfc0c0c5161c24' into eclair-plus-aosp

* commit 'dd848041237b660bad38e6567cbfc0c0c5161c24':
  Convert emma license info file into text format