tree 0d36a5b164ed843403b235ec4ec2a003321110fb
parent 6dbd73d8ddfcb07c4d0221b6da7335236e7aa632
parent 0701c756bc81d17cb5b0a8646d22fb1969f6bd77
author Scott Main <smain@google.com> 1332797543 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332797543 -0700

am 0701c756: am 33666ade: docs: re-add android design icon, which had been removed from original location

* commit '0701c756bc81d17cb5b0a8646d22fb1969f6bd77':
  docs: re-add android design icon, which had been removed from original location