OSDN Git Service

resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Tue, 8 Feb 2011 18:26:11 +0000 (10:26 -0800)
committerScott Main <smain@google.com>
Tue, 8 Feb 2011 18:26:11 +0000 (10:26 -0800)
commitbd669c171288e11d79c9fcdb182f8d9897346931
treeea8394774dd2af9d10699c0198d5639d47f212a6
parentd1fd0920d0da89610cd2e76c32d35466d78d50f5
parent7a3262b94553d93289624ae8bb55ab67c8915969
resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp

Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37