OSDN Git Service

Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycom...
authorEd Heyl <edheyl@google.com>
Sun, 29 May 2011 15:21:53 +0000 (08:21 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 29 May 2011 15:21:53 +0000 (08:21 -0700)
commit39ddeae0b647519f205e8d4cc334ad548ffe2ac8
tree6dc4adba0b1af2275895cc24beb516b08cb9d038
parent7e2181c0de51bd3671838c2e425e3b02973246fa
parent62388cfc1fb2483eb6582ccb8e36d47f16bf01fa
Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp