| commit | 9863ba94f09999c456e0f14c91bcfa342c4183c1 | [log] [tgz] |
|---|---|---|
| author | Nicolas Roard <nicolas@android.com> | Tue May 11 10:40:11 2010 -0700 |
| committer | Nicolas Roard <nicolas@android.com> | Tue May 11 10:40:11 2010 -0700 |
| tree | b72c1536842b835402cce4878ae092c08a4c5d0f | |
| parent | 834910f51f8a2d70d8b43182a48e91314ff63ba6 [diff] | |
| parent | bfd6805a8228d9b2f5e3476155456a6471b290cd [diff] |
resolved conflicts for merge of bfd6805a to master Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45