| commit | 7ffa22b98439d8440e75c5870831a6eb0fb256ec | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Jul 20 16:31:25 2011 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Jul 20 16:31:25 2011 -0700 |
| tree | 62a3555429c3caf6d6220df764adf91a9ee9b991 | |
| parent | 0fdf095f099d86d4fbf9d2092c9f1a3031f0fa3c [diff] | |
| parent | 5c0019bdac118b8be1ea343917471bb71163f2ed [diff] |
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe