| commit | 4a88013a4a06a9ea80e8419f94694936e6b013f0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 02 15:16:53 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 02 15:16:53 2010 -0800 |
| tree | e577b5f10df205463a542d7de841320958bf8c78 | |
| parent | 40eade14bb87d24903588de04449fdfe2e1795cb [diff] | |
| parent | bf1439c513f0d24a9d23755b50750831574785f4 [diff] |
resolved conflicts for merge of bf1439c5 to stage-korg-master Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99