| commit | 37a5ecfb84673673ba19893a7dfdb51d8c6406bd | [log] [tgz] |
|---|---|---|
| author | Benoit Goby <benoit@android.com> | Fri Jan 13 12:02:17 2012 -0800 |
| committer | Benoit Goby <benoit@android.com> | Fri Jan 13 12:02:17 2012 -0800 |
| tree | 114c8c8809f2549820cd0e798aa9c3e0e70fb35b | |
| parent | 82dd6af84676f1ea6f67ce6fbd2c5cea7a8aa601 [diff] | |
| parent | f134ee366f4dbea3b508176f8165fe7c54a398c0 [diff] |
resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp Change-Id: I7fee3ba108c72450a7f19dee036068cf3783e2fd