| commit | 471af5aaea2d2491a77dba379771f7c96b9ca3c3 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Nov 08 10:40:20 2011 -0800 |
| committer | Andreas Huber <andih@google.com> | Tue Nov 08 10:40:20 2011 -0800 |
| tree | 29609e7feb5c548e28ce94f88b4445c5c373d725 | |
| parent | 3b86c964df855a9740c446e984309b719c3ec37c [diff] | |
| parent | 936a981ba15d528a023311aa32f46446813551d9 [diff] |
resolved conflicts for merge of 26f70db9 to master Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120