| commit | dd0cd5e27ed6869d4c3aa670f4c91e29b823b06d | [log] [tgz] |
|---|---|---|
| author | Benoit Goby <benoit@android.com> | Mon Apr 11 19:07:11 2011 -0700 |
| committer | Benoit Goby <benoit@android.com> | Mon Apr 11 19:07:11 2011 -0700 |
| tree | 33c4289f87f6bf299bd57ca071b9b8442ddcec2b | |
| parent | a944e591fceba2f13a979af9327e258fcf017c9c [diff] | |
| parent | 316594715d31bb95b5efa08bfc80f287833b3a37 [diff] |
resolved conflicts for merge of 31659471 to master Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9