tree c5031660ad3cc14ccde19ed44da0a1e682b8bba0
parent 8b759655259c0aaf2d8feb7cee26f321a715806c
parent ed1cf3dab59d7af51240269308007546a816b1f4
author Gilles Debunne <debunne@google.com> 1285869619 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285869619 -0700

am ed1cf3da: am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread

Merge commit 'ed1cf3dab59d7af51240269308007546a816b1f4'

* commit 'ed1cf3dab59d7af51240269308007546a816b1f4':
  New assets: wifi signal 1, no sim card.