tree d34a0e1169aebf7d597889908e7b2a659fc4b493
parent 3b3631301d5956a3f1cf76faeac913cc09924058
parent 8f5c7f12dbcabb9c54799d48b9eb136e65285e8c
author Dirk Dougherty <nobody@android.com> 1243375579 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243375579 -0700

am fdacdcb6: am 1d6cb270: AI 149267: Add the images for icon guidelines doc   BUG=1790234

Merge commit 'fdacdcb6546b976b437dfc97e286cd1733e7bf93'

* commit 'fdacdcb6546b976b437dfc97e286cd1733e7bf93':
  AI 149267: Add the images for icon guidelines doc