| commit | ea427b0c87a52d5e770f50856401a81ff2658cc4 | [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 | 9f4e0ec427bd0b9ca6c8a3575bd784fc78c9968a | |
| parent | e43a7c18ecf3de8df774362a9bc3e97d8469ac00 [diff] | |
| parent | 26f70db99f483be36caa7a4c84fec5de50bec034 [diff] |
resolved conflicts for merge of 26f70db9 to master Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120