| commit | 175f4154a6c0ff0917d56d67a1ad22d883eadda2 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Feb 02 14:07:34 2012 -0800 |
| committer | Eric Fischer <enf@google.com> | Thu Feb 02 14:07:34 2012 -0800 |
| tree | 9e29465f67d1b32fbbc046b5ccada32e1c531132 | |
| parent | 201a77ea399527da0f69faf14cc26162909f43c7 [diff] | |
| parent | cbbfffca1e17a2234d3a3849b1b71060ca25f22d [diff] |
resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc