| commit | 8db59adccf3e07b9597a69858e8e4de4f7f233e7 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Aug 24 11:48:37 2010 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Aug 24 11:48:37 2010 -0700 |
| tree | 790ceca854ae5dc083784a1fe9d0c81b04809999 | |
| parent | 46089bd1cb031c578735707712cf9574678032fe [diff] | |
| parent | b037da401ad76843c32e7d732d43d452e0e6f978 [diff] |
resolved conflicts for merge of b037da40 to master Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121