tree dc0d4841ac3074f2c9a2b59c8ee8411d40f9e49a
parent 2f25e61b87ff8f54511fd9e777c26d50431679ea
parent b663a4b7da68cc6d81d4b338d94fb48eaec8cb05
author Dianne Hackborn <hackbod@google.com> 1331163578 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331163578 -0800

am b663a4b7: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

* commit 'b663a4b7da68cc6d81d4b338d94fb48eaec8cb05':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.