OSDN Git Service

resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp
authorJeff Hamilton <jham@android.com>
Wed, 26 Jan 2011 00:29:11 +0000 (18:29 -0600)
committerJeff Hamilton <jham@android.com>
Wed, 26 Jan 2011 00:29:11 +0000 (18:29 -0600)
commit05233d56752b922b943da1b14a12e74058db4967
tree6ef0a8feb57c4112b12022e195ae0182622cfb22
parent07c00287d82e3d31f320631cbb63de5fdd1362e8
parentf2074539402aa097d0bf360329c52466b673211e
resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp

Change-Id: I6de7a12f0f491f02a6765d1f3fbd28ba3a62bea3