commit | df5d015ae27c5b7bbdedfb9f58bb1eb6f1a96af3 | [log] [tgz] |
---|---|---|
author | Jeff Hamilton <jham@android.com> | Fri Jan 28 20:41:42 2011 -0600 |
committer | Jeff Hamilton <jham@android.com> | Fri Jan 28 20:41:42 2011 -0600 |
tree | e5d4658f89e6c351b282682b9ff022899dfe8cc5 | |
parent | 0d9209784aa062a20bf5dda66700c00fc65e4a32 [diff] | |
parent | dc54a8c742e96d6ea8ef3e18c0f2ee1235899599 [diff] |
resolved conflicts for merge of dc54a8c7 to honeycomb-merge Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8