| commit | 29c732154d20a5f1b1de5b5a21c47b8786a0f44e | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Jul 20 17:45:11 2011 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Jul 20 17:45:11 2011 -0700 |
| tree | 62a3555429c3caf6d6220df764adf91a9ee9b991 | |
| parent | 7ffa22b98439d8440e75c5870831a6eb0fb256ec [diff] | |
| parent | 2cb8dfb33d4adc0253d4fa26788f9227104e3d50 [diff] |
resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602