OSDN Git Service

Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycom...
authorGilles Debunne <debunne@google.com>
Wed, 9 Feb 2011 04:38:59 +0000 (20:38 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 Feb 2011 04:38:59 +0000 (20:38 -0800)
commit82f05a167355fd90eedd080ac67a38e326ff89ef
treeea8394774dd2af9d10699c0198d5639d47f212a6
parent0461cb736489e6d81f4ddaba875875eef5fb0d91
parentc1b753b09b188eebecb276afdf1e8ae07fc5086a
Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp