| commit | da8a78f6e418fa61e158a491a18c1a560ca98ca4 | [log] [tgz] |
|---|---|---|
| author | Benoit Goby <benoit@android.com> | Fri Jan 13 12:15:11 2012 -0800 |
| committer | Benoit Goby <benoit@android.com> | Fri Jan 13 12:15:11 2012 -0800 |
| tree | fbf5ff8a2a0e465b855b454600b25bd6a7a5e6b4 | |
| parent | e2931f8673e1dbbd33d68cfd9ef4797a4344afe6 [diff] | |
| parent | 95a90ebc3bb76e5c3c3b135e91fbadf15f72aafd [diff] |
resolved conflicts for merge of 95a90ebc to master Change-Id: I78eb43842250762060f299063b64e6610e0d2616