OSDN Git Service

Merge "resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp" into honeycom...
authorJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 22:03:51 +0000 (15:03 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jun 2011 22:03:51 +0000 (15:03 -0700)
commite121cd7408841b9aa776c3c11071043d9e5ab652
treeaa30a4379194cdb17d0ba95405b471499b23bcb2
parent13b37b896b1d0c95a19250c28f6966f87db220d7
parent5403b2a82d3f76299bd077c759a5827d2e0322a7
Merge "resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp