OSDN Git Service

Merge "resolved conflicts for merge of 4b1a37d7 to master"
authorWink Saville <wink@google.com>
Fri, 8 Apr 2011 22:25:14 +0000 (15:25 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 8 Apr 2011 22:25:14 +0000 (15:25 -0700)
commit6a93332948b5f62fae5f72189062f30e4b5b2ecc
tree6446fdfd35230a7bd1987c3681f0f6b09751d380
parent231fcec730083999a2aee40ed3fea68423a71b13
parentaeac73bc7aa9153a77408a17f5040be987ea8aeb
Merge "resolved conflicts for merge of 4b1a37d7 to master"