OSDN Git Service

resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
authorGilles Debunne <debunne@google.com>
Thu, 10 Feb 2011 22:43:35 +0000 (14:43 -0800)
committerGilles Debunne <debunne@google.com>
Thu, 10 Feb 2011 22:43:35 +0000 (14:43 -0800)
commit23820f6a8969f99722cb32d3ddf243d103af01a9
treeea8394774dd2af9d10699c0198d5639d47f212a6
parent11b5325535fd1b022c5140eb8de62d2a825c1acd
parent4dffae17181e75a1acebd2bb7e138a8fdf51766a
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp

Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b