tree ba2b4aeb0f5f9e61767f978c8fc6448077cea9d2
parent 7ed7668b30e70ca8e3f0f183364433326ed29f39
parent c5083cdfff55a8fdcc82198273afd7dbe6379879
author Scott Main <smain@google.com> 1283477416 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283477416 -0700

am c5083cdf: Merge "clarify dp dimension description" into froyo

Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread

* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
  clarify dp dimension description