OSDN Git Service

am b29d6806: am 469bc0ef: am 4b87a0bd: am 7ce32619: support for simplified computed...
authorJohn Hoford <hoford@google.com>
Mon, 8 Apr 2013 16:24:53 +0000 (09:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Apr 2013 16:24:53 +0000 (09:24 -0700)
* commit 'b29d68063788f96c2805c0abf93f1a202fb6f291':
  support for simplified computed icons


Trivial merge