OSDN Git Service

resolved conflicts for merge of f15f8a1b to jb-dev
authorScott Main <smain@google.com>
Wed, 3 Oct 2012 23:42:06 +0000 (16:42 -0700)
committerScott Main <smain@google.com>
Wed, 3 Oct 2012 23:42:06 +0000 (16:42 -0700)
commit4d62456e211a0b4cd77a8967417340612994cb6c
tree3310b6924a72e784d49ee4386ca95d178cb92693
parent25a9144bf8728f24a87ca21f9e1c19c5fcc9abdc
parentf15f8a1b441d8fb1d2548e1ce04000b1681a6d66
resolved conflicts for merge of f15f8a1b to jb-dev

Change-Id: Ic20777658426aa27304858dd51f315ee967a7bfa
docs/html/design/style/iconography.jd