OSDN Git Service

resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
authorKatie McCormick <kmccormick@google.com>
Thu, 10 Feb 2011 20:38:07 +0000 (12:38 -0800)
committerKatie McCormick <kmccormick@google.com>
Thu, 10 Feb 2011 20:38:07 +0000 (12:38 -0800)
commitb91f20af989649dd04652e95a9cfb9f85f4e7086
treeea8394774dd2af9d10699c0198d5639d47f212a6
parent31e6d2e0d3fcc804fe61f6008f092db1301cf72b
parent5ffcfb88f0bc2095fec08b8b79bc1754408187a4
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp

Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc