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)
commitc65c5fdec19913bc2723947a92e1379b90368a8f
treef9d4670d5ac61840223b644422338f9c8e1a782a
parentbe3770f3f932c5242e387b5dbc8baa75fb3bf373
parentb7bad4f22a3da1128111d1865057f002327783e3
resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp

Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37