tree acf50d2486ac4d28a02a9addc452bdcc75158090
parent 93bab39af5a652a707ea152f112eb1363d1929aa
parent 523959f50e56d8c888f39e19855ffdc8d0c2b6fc
author David Brown <dab@google.com> 1278966949 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278966949 -0700

am 523959f5: am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread

Merge commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc'

* commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc':
  Deprecate some status bar icons that now come from the phone app (and