commit c090ce8c6f0d8c4fc176be4bb182548f11a3a13e
author Scott Main <smain@google.com> Thu Jun 06 12:05:37 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 06 12:05:37 2013 -0700
tree 7a72557c7d070b3eac2bf506fb16f39c57a14bc6
parent f14698551aeb57dc1952413480cb72a0c8ffb620
parent c51315674f27a12840c9e12d1ec7e0006bdba054

am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya k

* commit 'c51315674f27a12840c9e12d1ec7e0006bdba054':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.