tree 0d36a5b164ed843403b235ec4ec2a003321110fb
parent c07c8d05910f3ceea4095d7d1ceb0fd7031aa021
parent dde474b61822bc867ece1310125343f9937d384f
author Scott Main <smain@google.com> 1332798848 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332798848 -0700

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

* commit 'dde474b61822bc867ece1310125343f9937d384f':