OSDN Git Service

Merge "resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp" into honeycom...
authorEd Heyl <edheyl@google.com>
Fri, 4 Mar 2011 23:07:23 +0000 (15:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Mar 2011 23:07:23 +0000 (15:07 -0800)
commit45170dd6bbc2106a837a6f39a6bf6455ea36d9cf
treef39d5cba0f3de8e7dde45d428f361a247bd51451
parentc0906230013ec3788f0013f8b53f9732f866ff69
parent67c70267d16996ced73ac2e7648b0a79baed3c16
Merge "resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp" into honeycomb-plus-aosp