| commit | d6025bd94892036dda5196a5de5800c7c4f4ae80 | [log] [tgz] |
|---|---|---|
| author | Benoit Goby <benoit@android.com> | Fri Jan 20 15:45:02 2012 -0800 |
| committer | Benoit Goby <benoit@android.com> | Fri Jan 20 15:45:02 2012 -0800 |
| tree | 757425ac2557ab4c5b6f7cd67c221f24d59dd338 | |
| parent | 6c25462f2cb7cfaf941be5d1c47e911e638ab24d [diff] | |
| parent | 89880553d01968150628b18dc6224271be4e9922 [diff] |
resolved conflicts for merge of 89880553 to master Change-Id: I76fc69d27d2a3417f41e9a916920eea6c3fe707f