| commit | a19c5e63804e6cffac5771b9749aad6c441e5e21 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Fri Jun 15 09:03:52 2012 +0900 |
| committer | Jean Chalard <jchalard@google.com> | Fri Jun 15 09:03:52 2012 +0900 |
| tree | 053f52981757af30878c13b7dd511c56ecc092f2 | |
| parent | 6b9b8e1620f33356e54f6737cc5f4f2522975e59 [diff] | |
| parent | be82f2974bff90ddf3c3bcf9c2cf0dae59c8cf58 [diff] |
resolved conflicts for merge of be82f297 to master Change-Id: If49ca384ea0ac415a75f8ea1bad77dc6719cb04d