| commit | ef54af248bf611400751bf826464155c97c2e739 | [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 | b4af0ab8dda6d7e0d3d0b377ae76560a4f8108cc | |
| parent | 75d9e1cd13455e019d9e2c34a55d2eb15151dc3c [diff] | |
| parent | d27954e05a3b73933a42048109bdf0a7690c9cb6 [diff] |
resolved conflicts for merge of d27954e0 to master Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9